From: Amir Vadai Date: Thu, 4 Jun 2009 14:46:19 +0000 (+0300) Subject: sdp: arm nagle timer on not sent packet instead of on sent packet X-Git-Tag: v4.1.12-92~264^2~5^2~271 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0896cd733aeaa7b89e93c69a888005ad29369f12;p=users%2Fjedix%2Flinux-maple.git sdp: arm nagle timer on not sent packet instead of on sent packet Signed-off-by: Amir Vadai --- diff --git a/drivers/infiniband/ulp/sdp/sdp_bcopy.c b/drivers/infiniband/ulp/sdp/sdp_bcopy.c index 24f734f0ed4f2..944c973aac117 100644 --- a/drivers/infiniband/ulp/sdp/sdp_bcopy.c +++ b/drivers/infiniband/ulp/sdp/sdp_bcopy.c @@ -116,10 +116,11 @@ static inline int sdp_nagle_off(struct sdp_sock *ssk, struct sk_buff *skb) if (send_now) { unsigned long mseq = ring_head(ssk->tx_ring); ssk->nagle_last_unacked = mseq; - - if (!timer_pending(&ssk->nagle_timer)) + } else { + if (!timer_pending(&ssk->nagle_timer)) { mod_timer(&ssk->nagle_timer, jiffies + SDP_NAGLE_TIMEOUT); - sdp_dbg_data(&ssk->isk.sk, "Starting nagle timer\n"); + sdp_dbg_data(&ssk->isk.sk, "Starting nagle timer\n"); + } } sdp_dbg_data(&ssk->isk.sk, "send_now = %d last_unacked = %ld\n", send_now, ssk->nagle_last_unacked);