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>

5 files changed, 10 insertions, 19 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index b45ed1f96921..2f95f5a5145d 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -434,8 +434,7 @@ void sctp_association_free(struct sctp_association *asoc)
          * on our state.
          */
         for (i = SCTP_EVENT_TIMEOUT_NONE; i < SCTP_NUM_TIMEOUT_TYPES; ++i) {
-                if (timer_pending(&asoc->timers[i]) &&
-                    del_timer(&asoc->timers[i]))
+                if (del_timer(&asoc->timers[i]))
                         sctp_association_put(asoc);
         }
 
@@ -1497,7 +1496,7 @@ void sctp_assoc_rwnd_increase(struct sctp_association *asoc, unsigned int len)
 
                 /* Stop the SACK timer.  */
                 timer = &asoc->timers[SCTP_EVENT_TIMEOUT_SACK];
-                if (timer_pending(timer) && del_timer(timer))
+                if (del_timer(timer))
                         sctp_association_put(asoc);
         }
 }
diff --git a/net/sctp/input.c b/net/sctp/input.c
index 8bd3c279427e..965bbbbe48d4 100644
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -468,8 +468,7 @@ void sctp_icmp_proto_unreachable(struct sock *sk,
         } else {
                 struct net *net = sock_net(sk);
 
-                if (timer_pending(&t->proto_unreach_timer) &&
-                    del_timer(&t->proto_unreach_timer))
+                if (del_timer(&t->proto_unreach_timer))
                         sctp_association_put(asoc);
 
                 sctp_do_sm(net, SCTP_EVENT_T_OTHER,
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,
                  * address.
                  */
                 if (!transport->flight_size) {
-                        if (timer_pending(&transport->T3_rtx_timer) &&
-                            del_timer(&transport->T3_rtx_timer)) {
+                        if (del_timer(&transport->T3_rtx_timer))
                                 sctp_transport_put(transport);
-                        }
                 } else if (restart_timer) {
                         if (!mod_timer(&transport->T3_rtx_timer,
                                        jiffies + transport->rto))
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index c9577754a708..8aab894aeabe 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -674,10 +674,8 @@ static void sctp_cmd_t3_rtx_timers_stop(sctp_cmd_seq_t *cmds,
 
         list_for_each_entry(t, &asoc->peer.transport_addr_list,
                         transports) {
-                if (timer_pending(&t->T3_rtx_timer) &&
-                    del_timer(&t->T3_rtx_timer)) {
+                if (del_timer(&t->T3_rtx_timer))
                         sctp_transport_put(t);
-                }
         }
 }
 
@@ -1517,7 +1515,7 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
 
                 case SCTP_CMD_TIMER_STOP:
                         timer = &asoc->timers[cmd->obj.to];
-                        if (timer_pending(timer) && del_timer(timer))
+                        if (del_timer(timer))
                                 sctp_association_put(asoc);
                         break;
 
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index ca5331cc1ed2..fafd2a461ba0 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -151,13 +151,11 @@ void sctp_transport_free(struct sctp_transport *transport)
          * structure hang around in memory since we know
          * the tranport is going away.
          */
-        if (timer_pending(&transport->T3_rtx_timer) &&
-            del_timer(&transport->T3_rtx_timer))
+        if (del_timer(&transport->T3_rtx_timer))
                 sctp_transport_put(transport);
 
         /* Delete the ICMP proto unreachable timer if it's active. */
-        if (timer_pending(&transport->proto_unreach_timer) &&
-            del_timer(&transport->proto_unreach_timer))
+        if (del_timer(&transport->proto_unreach_timer))
                 sctp_association_put(transport->asoc);
 
         sctp_transport_put(transport);
@@ -655,10 +653,9 @@ void sctp_transport_reset(struct sctp_transport *t)
 void sctp_transport_immediate_rtx(struct sctp_transport *t)
 {
         /* Stop pending T3_rtx_timer */
-        if (timer_pending(&t->T3_rtx_timer)) {
-                (void)del_timer(&t->T3_rtx_timer);
+        if (del_timer(&t->T3_rtx_timer))
                 sctp_transport_put(t);
-        }
+
         sctp_retransmit(&t->asoc->outqueue, t, SCTP_RTXR_T3_RTX);
         if (!timer_pending(&t->T3_rtx_timer)) {
                 if (!mod_timer(&t->T3_rtx_timer, jiffies + t->rto))