sdp: BUG1899 - fix warnings on RH4.8 by avoiding multiple deletions on the same timer.

Signed-off-by: Amir Vadai <amirv@mellanox.co.il>

diff --git a/drivers/infiniband/ulp/sdp/sdp_tx.c b/drivers/infiniband/ulp/sdp/sdp_tx.c
index 7f5f85cd01a4457caa151c157dd179217fc7a34d..3c46d40379a82bbe2ed4c2e6ca3ca7f1d389279c 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_tx.c
+++ b/drivers/infiniband/ulp/sdp/sdp_tx.c
@@ -514,7 +514,9 @@ out:
 
 void sdp_tx_ring_destroy(struct sdp_sock *ssk)
 {
-       del_timer(&ssk->nagle_timer);
+
+       if (ssk->nagle_timer.function)
+               del_timer(&ssk->nagle_timer);
 
        if (ssk->tx_ring.buffer) {
                sdp_tx_ring_purge(ssk);