aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp/outqueue.c
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2013-02-03 15:32:57 -0500
committerDavid S. Miller <davem@davemloft.net>2013-02-04 13:26:49 -0500
commit25cc4ae913a46bcc11b03c37bec59568f2122a36 (patch)
tree0a69dfa2c245d48fb44c6f2ab8e93587cf8516a7 /net/sctp/outqueue.c
parent2b3c9a850c3f2da7430c39dde0fb5cab56f8501d (diff)
net: remove redundant check for timer pending state before del_timer
As in del_timer() there has already placed a timer_pending() function to check whether the timer to be deleted is pending or not, it's unnecessary to check timer pending state again before del_timer() is called. Signed-off-by: Ying Xue <ying.xue@windriver.com> Cc: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/outqueue.c')
-rw-r--r--net/sctp/outqueue.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 9bcdbd02d777..01dca753db16 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -1700,10 +1700,8 @@ static void sctp_check_transmitted(struct sctp_outq *q,
1700 * address. 1700 * address.
1701 */ 1701 */
1702 if (!transport->flight_size) { 1702 if (!transport->flight_size) {
1703 if (timer_pending(&transport->T3_rtx_timer) && 1703 if (del_timer(&transport->T3_rtx_timer))
1704 del_timer(&transport->T3_rtx_timer)) {
1705 sctp_transport_put(transport); 1704 sctp_transport_put(transport);
1706 }
1707 } else if (restart_timer) { 1705 } else if (restart_timer) {
1708 if (!mod_timer(&transport->T3_rtx_timer, 1706 if (!mod_timer(&transport->T3_rtx_timer,
1709 jiffies + transport->rto)) 1707 jiffies + transport->rto))