From 76d9c1a2f03543b132890a2ea51ea17d9e17e1cd Mon Sep 17 00:00:00 2001 From: Amir Vadai Date: Thu, 4 Feb 2010 17:31:52 +0200 Subject: [PATCH] sdp: BUG1899 - fix warnings on RH4.8 by avoiding multiple deletions on the same timer. Signed-off-by: Amir Vadai --- drivers/infiniband/ulp/sdp/sdp_tx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/ulp/sdp/sdp_tx.c b/drivers/infiniband/ulp/sdp/sdp_tx.c index 7f5f85cd01a44..3c46d40379a82 100644 --- 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); -- 2.51.0