aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/net_namespace.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-23 10:52:59 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-23 10:52:59 +0200
commita60b33cf59d1c9e0e363287fce799cb23d45660c (patch)
tree85eb8feea5717cf472a2549e53f59183a95617c5 /net/core/net_namespace.c
parentsoftirq: remove irqs_disabled warning from local_bh_enable (diff)
parentSlab: Fix memory leak in fallback_alloc() (diff)
downloadlinux-dev-a60b33cf59d1c9e0e363287fce799cb23d45660c.tar.xz
linux-dev-a60b33cf59d1c9e0e363287fce799cb23d45660c.zip
Merge branch 'linus' into core/softirq
Diffstat (limited to 'net/core/net_namespace.c')
-rw-r--r--net/core/net_namespace.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 72b4c184dd84..7c52fe277b62 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -140,6 +140,9 @@ static void cleanup_net(struct work_struct *work)
struct pernet_operations *ops;
struct net *net;
+ /* Be very certain incoming network packets will not find us */
+ rcu_barrier();
+
net = container_of(work, struct net, work);
mutex_lock(&net_mutex);