]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
sdp: arm nagle timer on not sent packet instead of on sent packet
authorAmir Vadai <amirv@mellanox.co.il>
Thu, 4 Jun 2009 14:46:19 +0000 (17:46 +0300)
committerMukesh Kacker <mukesh.kacker@oracle.com>
Tue, 6 Oct 2015 12:04:31 +0000 (05:04 -0700)
Signed-off-by: Amir Vadai <amirv@mellanox.co.il>
drivers/infiniband/ulp/sdp/sdp_bcopy.c

index 24f734f0ed4f2a8ae1b78631cf6b29ce219a712e..944c973aac1175998fa10665ae48e3ad2de31e2c 100644 (file)
@@ -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);