diff options
author | Eric Dumazet <edumazet@google.com> | 2017-10-20 14:29:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-10-21 22:13:19 -0400 |
commit | ee74d9967b829232723939cb7c9b100b29f6ec98 (patch) | |
tree | 6d81457c99f041698851601e7d00ef8df9b65ccd /drivers/net/tun.c | |
parent | 81d98fa4df3d1683b3ef21e8a7a0ccac7874f0de (diff) |
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 <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r-- | drivers/net/tun.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 995887de5a98..2a2d058cdd40 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
@@ -1197,8 +1197,6 @@ static void tun_flow_init(struct tun_struct *tun) | |||
1197 | 1197 | ||
1198 | tun->ageing_time = TUN_FLOW_EXPIRE; | 1198 | tun->ageing_time = TUN_FLOW_EXPIRE; |
1199 | setup_timer(&tun->flow_gc_timer, tun_flow_cleanup, (unsigned long)tun); | 1199 | setup_timer(&tun->flow_gc_timer, tun_flow_cleanup, (unsigned long)tun); |
1200 | mod_timer(&tun->flow_gc_timer, | ||
1201 | round_jiffies_up(jiffies + tun->ageing_time)); | ||
1202 | } | 1200 | } |
1203 | 1201 | ||
1204 | static void tun_flow_uninit(struct tun_struct *tun) | 1202 | static void tun_flow_uninit(struct tun_struct *tun) |