]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
sdp: fixed a deadlock when tx_timer calls sdp_reset that tries to del the timer
authorEldad Zinger <eldadz@mellanox.co.il>
Sun, 15 Aug 2010 07:17:42 +0000 (10:17 +0300)
committerMukesh Kacker <mukesh.kacker@oracle.com>
Tue, 6 Oct 2015 12:05:18 +0000 (05:05 -0700)
Signed-off-by: Eldad Zinger <eldadz@mellanox.co.il>
drivers/infiniband/ulp/sdp/sdp.h

index 4cf0316debdac69b8d6b5380c51468ffa523f9f4..4439b7b0b49cca6bd0f0dc55cfedc8d3ea1184ee 100644 (file)
@@ -526,9 +526,6 @@ static inline int _sdp_exch_state(const char *func, int line, struct sock *sk,
 
        spin_unlock_irqrestore(&sdp_sk(sk)->lock, flags);
 
-       if (TCP_CLOSE == state)
-               del_timer_sync(&sdp_sk(sk)->tx_ring.timer);
-
        return old;
 }
 #define sdp_exch_state(sk, from_states, state) \