diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:00:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:00:26 -0400 |
| commit | 198bb971e256e4167e45e7df643c13ea66f67e3a (patch) | |
| tree | 85b8b2bf6cc78bf0e53a2187ed5796f076922334 /net/core/dev.c | |
| parent | ea71a546706dfdad72462624394e1e472c6bf34f (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
Merge branch 'linus' into sched/urgent
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 68d8df0992a..c421a1f8f0b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -2077,6 +2077,10 @@ int netif_receive_skb(struct sk_buff *skb) | |||
| 2077 | 2077 | ||
| 2078 | rcu_read_lock(); | 2078 | rcu_read_lock(); |
| 2079 | 2079 | ||
| 2080 | /* Don't receive packets in an exiting network namespace */ | ||
| 2081 | if (!net_alive(dev_net(skb->dev))) | ||
| 2082 | goto out; | ||
| 2083 | |||
| 2080 | #ifdef CONFIG_NET_CLS_ACT | 2084 | #ifdef CONFIG_NET_CLS_ACT |
| 2081 | if (skb->tc_verd & TC_NCLS) { | 2085 | if (skb->tc_verd & TC_NCLS) { |
| 2082 | skb->tc_verd = CLR_TC_NCLS(skb->tc_verd); | 2086 | skb->tc_verd = CLR_TC_NCLS(skb->tc_verd); |