tun: do not arm flow_gc_timer in tun_flow_init()
authorEric Dumazet <edumazet@google.com>
Fri, 20 Oct 2017 18:29:57 +0000 (11:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 22 Oct 2017 02:13:19 +0000 (03:13 +0100)
Timer is properly armed on demand from tun_flow_update(),
so there is no need to arm it at tun init.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tun.c

index 995887de5a98283382a631bcb8dfd874a4037ed3..2a2d058cdd403594e3f89c9a491ada17e3063506 100644 (file)
@@ -1197,8 +1197,6 @@ static void tun_flow_init(struct tun_struct *tun)
 
        tun->ageing_time = TUN_FLOW_EXPIRE;
        setup_timer(&tun->flow_gc_timer, tun_flow_cleanup, (unsigned long)tun);
-       mod_timer(&tun->flow_gc_timer,
-                 round_jiffies_up(jiffies + tun->ageing_time));
 }
 
 static void tun_flow_uninit(struct tun_struct *tun)