From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Sun, 29 Aug 2010 19:23:11 +0000 (+0000)
Subject: dccp ccid-2: Remove wrappers around sk_{reset,stop}_timer()
X-Git-Tag: v2.6.37-rc1~147^2~634
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d26eeb07fd02de31848b59d19687daff0e93532f;p=pandora-kernel.git

dccp ccid-2: Remove wrappers around sk_{reset,stop}_timer()

This removes the wrappers around the sk timer functions, since not much is
gained from using them: the BUG_ON in start_rto_timer will never trigger
since that function is called only if:

 * the RTO timer expires (rto_expire, and then timer_pending() is false);
 * in tx_packet_sent only if !timer_pending() (BUG_ON is redundant here);
 * previously in new_ack, after stopping the timer (timer_pending() false).

Removing the wrappers also clears the way for eventually replacing the
RTO timer with the icsk-retransmission-timer, as it is already part of the
DCCP socket.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed