tun: do not arm flow_gc_timer in tun_flow_init()

edumazet · davem330 · commit ee74d9967b82 · 2017-10-22T03:13:19.000+01:00
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 &lt;edumazet@google.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -1197,8 +1197,6 @@ static void tun_flow_init(struct tun_struct *tun)`
`1197`	`1197`
`1198`	`1198`	`tun->ageing_time = TUN_FLOW_EXPIRE;`
`1199`	`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`	`1202`	`static void tun_flow_uninit(struct tun_struct *tun)`