From: Amir Vadai Date: Thu, 4 Feb 2010 15:31:52 +0000 (+0200) Subject: sdp: BUG1899 - fix warnings on RH4.8 by avoiding multiple deletions on the same timer. X-Git-Tag: v4.1.12-92~264^2~5^2~219 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=76d9c1a2f03543b132890a2ea51ea17d9e17e1cd;p=users%2Fjedix%2Flinux-maple.git sdp: BUG1899 - fix warnings on RH4.8 by avoiding multiple deletions on the same timer. Signed-off-by: Amir Vadai --- 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);