From: Eldad Zinger <eldadz@mellanox.co.il>
Date: Tue, 18 May 2010 10:32:27 +0000 (+0300)
Subject: sdp: tx timer is deleted when sockets goes to TCP_CLOSE
X-Git-Tag: v4.1.12-92~264^2~5^2~184
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=597c75df38a4619dcc3efc5332b4eda1b74198df;p=users%2Fjedix%2Flinux-maple.git

sdp: tx timer is deleted when sockets goes to TCP_CLOSE

Signed-off-by: Eldad Zinger <eldadz@mellanox.co.il>
---

diff --git a/drivers/infiniband/ulp/sdp/sdp.h b/drivers/infiniband/ulp/sdp/sdp.h
index bb258c68b73ef..085ffce6b791f 100644
--- a/drivers/infiniband/ulp/sdp/sdp.h
+++ b/drivers/infiniband/ulp/sdp/sdp.h
@@ -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;