From: Chris Mason <chris.mason@oracle.com>
Date: Fri, 3 Feb 2012 16:07:54 +0000 (-0500)
Subject: Make sure to kick rds_send_xmit for both LL_SEND_FULL and for the congestion map... 
X-Git-Tag: v4.1.12-92~319^2^2~2^2~49
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=04b2cfaaf606a15d84b38fb7d7b7d631b22ca9d6;p=users%2Fjedix%2Flinux-maple.git

Make sure to kick rds_send_xmit for both LL_SEND_FULL and for the congestion map updates.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Bang Nguyen <bang.nguyen@oracle.com>
---

diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index 4b444f31d4de..3c60740fd18e 100644
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -297,7 +297,9 @@ void rds_ib_tasklet_fn_send(unsigned long data)
 	ib_req_notify_cq(ic->i_scq, IB_CQ_SOLICITED);
 	poll_cq(ic, ic->i_scq, ic->i_send_wc, &ack_state);
 
-	if (rds_conn_up(conn) && !test_bit(RDS_LL_SEND_FULL, &conn->c_flags))
+	if (rds_conn_up(conn) &&
+	   (!test_bit(RDS_LL_SEND_FULL, &conn->c_flags) ||
+	    test_bit(0, &conn->c_map_queued)))
 		rds_send_xmit(ic->conn);
 }