diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:21 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:21 +0200 |
commit | 8b7ef4ec5b1ac8b6feebf5ae9cda85a7514728f8 (patch) | |
tree | 8f1f746f98707fb82bcec281ee8f65216eddae36 /net/core/dev.c | |
parent | a1d5a8691f1b6c92491747bea3b778b184fa5837 (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge branch 'linus' into x86/fixmaptip-x86-fixmap-2008-06-25_10.30_Wed
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 68d8df0992ab..c421a1f8f0b9 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2077,6 +2077,10 @@ int netif_receive_skb(struct sk_buff *skb) rcu_read_lock(); + /* Don't receive packets in an exiting network namespace */ + if (!net_alive(dev_net(skb->dev))) + goto out; + #ifdef CONFIG_NET_CLS_ACT if (skb->tc_verd & TC_NCLS) { skb->tc_verd = CLR_TC_NCLS(skb->tc_verd); |