]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
sdp: tx timer is deleted when sockets goes to TCP_CLOSE
authorEldad Zinger <eldadz@mellanox.co.il>
Tue, 18 May 2010 10:32:27 +0000 (13:32 +0300)
committerMukesh Kacker <mukesh.kacker@oracle.com>
Tue, 6 Oct 2015 12:04:57 +0000 (05:04 -0700)
Signed-off-by: Eldad Zinger <eldadz@mellanox.co.il>
drivers/infiniband/ulp/sdp/sdp.h

index bb258c68b73ef8baaf13d4fa8fe0f7893911b6db..085ffce6b791fccc4881d01e5e135424dd1a766a 100644 (file)
@@ -472,6 +472,11 @@ static inline int _sdp_exch_state(const char *func, int line, struct sock *sk,
                        from_states);
        }
 
+       if (TCP_CLOSE == state)
+               del_timer(&sdp_sk(sk)->tx_ring.timer);
+       /* TODO: make sure that no one will set that timer when status is
+        * TCP_CLOSE */
+
        old = sk->sk_state;
        sk->sk_state = state;