net: remove redundant check for timer pending state before del_timer

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / netfilter / ipt_ULOG.c

diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index b5ef3cba225046fdc142bf5029954e02fcb08df1..7d168dcbd135c7bf47c7772038454965311e9715 100644 (file)
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -88,10 +88,8 @@ static void ulog_send(unsigned int nlgroupnum)
 {
        ulog_buff_t *ub = &ulog_buffers[nlgroupnum];
 
-       if (timer_pending(&ub->timer)) {
-               pr_debug("ulog_send: timer was pending, deleting\n");
-               del_timer(&ub->timer);
-       }
+       pr_debug("ulog_send: timer is deleting\n");
+       del_timer(&ub->timer);
 
        if (!ub->skb) {
                pr_debug("ulog_send: nothing to send\n");
@@ -426,10 +424,8 @@ static void __exit ulog_tg_exit(void)
        /* remove pending timers and free allocated skb's */
        for (i = 0; i < ULOG_MAXNLGROUPS; i++) {
                ub = &ulog_buffers[i];
-               if (timer_pending(&ub->timer)) {
-                       pr_debug("timer was pending, deleting\n");
-                       del_timer(&ub->timer);
-               }
+               pr_debug("timer is deleting\n");
+               del_timer(&ub->timer);
 
                if (ub->skb) {
                        kfree_skb(ub->skb);