Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...

[cascardo/linux.git] / net / rds / tcp_send.c

diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
index 34fdcc0..a28b895 100644 (file)
--- a/net/rds/tcp_send.c
+++ b/net/rds/tcp_send.c
@@ -240,7 +240,9 @@ void rds_tcp_write_space(struct sock *sk)
        tc->t_last_seen_una = rds_tcp_snd_una(tc);
        rds_send_drop_acked(conn, rds_tcp_snd_una(tc), rds_tcp_is_acked);
 
-       queue_delayed_work(rds_wq, &conn->c_send_w, 0);
+        if ((atomic_read(&sk->sk_wmem_alloc) << 1) <= sk->sk_sndbuf)
+               queue_delayed_work(rds_wq, &conn->c_send_w, 0);
+
 out:
        read_unlock(&sk->sk_callback_lock);