diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
commit | eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0 (patch) | |
tree | 5ac6f43899648abeab1d43aad3107f664e7f13d5 /net/ipx | |
parent | c4762aba0b1f72659aae9ce37b772ca8bd8f06f4 (diff) | |
parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) |
Merge branch 'linus' into cpus4096-for-linus
Conflicts:
net/sunrpc/svc.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/ipx')
-rw-r--r-- | net/ipx/af_ipx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c index 81ae8735f5e3..b6e70f92e7fb 100644 --- a/net/ipx/af_ipx.c +++ b/net/ipx/af_ipx.c | |||
@@ -335,7 +335,7 @@ static int ipxitf_device_event(struct notifier_block *notifier, | |||
335 | struct net_device *dev = ptr; | 335 | struct net_device *dev = ptr; |
336 | struct ipx_interface *i, *tmp; | 336 | struct ipx_interface *i, *tmp; |
337 | 337 | ||
338 | if (dev_net(dev) != &init_net) | 338 | if (!net_eq(dev_net(dev), &init_net)) |
339 | return NOTIFY_DONE; | 339 | return NOTIFY_DONE; |
340 | 340 | ||
341 | if (event != NETDEV_DOWN && event != NETDEV_UP) | 341 | if (event != NETDEV_DOWN && event != NETDEV_UP) |
@@ -1636,7 +1636,7 @@ static int ipx_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty | |||
1636 | u16 ipx_pktsize; | 1636 | u16 ipx_pktsize; |
1637 | int rc = 0; | 1637 | int rc = 0; |
1638 | 1638 | ||
1639 | if (dev_net(dev) != &init_net) | 1639 | if (!net_eq(dev_net(dev), &init_net)) |
1640 | goto drop; | 1640 | goto drop; |
1641 | 1641 | ||
1642 | /* Not ours */ | 1642 | /* Not ours */ |