renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code

tun: do not block BH again in tun_flow_cleanup()

Browse Source 
tun_flow_cleanup() being a timer callback, it is already
running in BH context.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2017-10-20 11:29:55 -07:00 committed by David S. Miller
parent 02db34d04e
commit 7dbfb4ef77
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/tun.c
View File

@ -454,7 +454,7 @@ static void tun_flow_cleanup(unsigned long data)
tun_debug(KERN_INFO, tun, "tun_flow_cleanup\n"); tun_debug(KERN_INFO, tun, "tun_flow_cleanup\n");
spin_lock_bh(&tun->lock); spin_lock(&tun->lock);
for (i = 0; i < TUN_NUM_FLOW_ENTRIES; i++) { for (i = 0; i < TUN_NUM_FLOW_ENTRIES; i++) {
struct tun_flow_entry *e; struct tun_flow_entry *e;
struct hlist_node *n; struct hlist_node *n;
@ -472,7 +472,7 @@ static void tun_flow_cleanup(unsigned long data)
if (count) if (count)
mod_timer(&tun->flow_gc_timer, round_jiffies_up(next_timer)); mod_timer(&tun->flow_gc_timer, round_jiffies_up(next_timer));
spin_unlock_bh(&tun->lock); spin_unlock(&tun->lock);
} }
static void tun_flow_update(struct tun_struct *tun, u32 rxhash, static void tun_flow_update(struct tun_struct *tun, u32 rxhash,