diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 15:05:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 15:05:58 +0200 |
| commit | 1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526 (patch) | |
| tree | b5691dd5aa48ac32fdbaef44afcbcc92f01592d3 /net/ipv4/netfilter/ipt_MASQUERADE.c | |
| parent | 32172561889868c0ea422ea8570f0413963a815f (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into x86/paravirt-spinlocks
Diffstat (limited to 'net/ipv4/netfilter/ipt_MASQUERADE.c')
| -rw-r--r-- | net/ipv4/netfilter/ipt_MASQUERADE.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c index 84c26dd27d8..0841aefaa50 100644 --- a/net/ipv4/netfilter/ipt_MASQUERADE.c +++ b/net/ipv4/netfilter/ipt_MASQUERADE.c @@ -120,7 +120,7 @@ static int masq_device_event(struct notifier_block *this, { const struct net_device *dev = ptr; - if (dev_net(dev) != &init_net) + if (!net_eq(dev_net(dev), &init_net)) return NOTIFY_DONE; if (event == NETDEV_DOWN) { |