From: Eric Dumazet Date: Fri, 20 Oct 2017 18:29:57 +0000 (-0700) Subject: tun: do not arm flow_gc_timer in tun_flow_init() X-Git-Tag: v4.15-rc1~84^2~359^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee74d9967b829232723939cb7c9b100b29f6ec98;p=thirdparty%2Flinux.git tun: do not arm flow_gc_timer in tun_flow_init() 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 995887de5a982..2a2d058cdd403 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -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)