diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:10 +0200 |
| commit | 28f73e51d0f64a5b896ad816ab8df6f3bcec5810 (patch) | |
| tree | 8c51ad5ff74d6ef5d1d68121c9f9aadce836736e /net/core/net_namespace.c | |
| parent | x86: use cpu_khz for loops_per_jiffy calculation, cleanup (diff) | |
| parent | Linux 2.6.26-rc8 (diff) | |
| download | linux-dev-28f73e51d0f64a5b896ad816ab8df6f3bcec5810.tar.xz linux-dev-28f73e51d0f64a5b896ad816ab8df6f3bcec5810.zip | |
Merge branch 'linus' into x86/delay
Conflicts:
arch/x86/kernel/tsc_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/core/net_namespace.c')
| -rw-r--r-- | net/core/net_namespace.c | 3 |
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); |