diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 21:02:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 21:02:35 -0400 |
commit | 334d094504c2fe1c44211ecb49146ae6bca8c321 (patch) | |
tree | d3c0f68e4b9f8e3d2ccc39e7dfe5de0534a5fad9 /net/ipx/af_ipx.c | |
parent | d1a4be630fb068f251d64b62919f143c49ca8057 (diff) | |
parent | d1643d24c61b725bef399cc1cf2944b4c9c23177 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26: (1090 commits)
[NET]: Fix and allocate less memory for ->priv'less netdevices
[IPV6]: Fix dangling references on error in fib6_add().
[NETLABEL]: Fix NULL deref in netlbl_unlabel_staticlist_gen() if ifindex not found
[PKT_SCHED]: Fix datalen check in tcf_simp_init().
[INET]: Uninline the __inet_inherit_port call.
[INET]: Drop the inet_inherit_port() call.
SCTP: Initialize partial_bytes_acked to 0, when all of the data is acked.
[netdrvr] forcedeth: internal simplifications; changelog removal
phylib: factor out get_phy_id from within get_phy_device
PHY: add BCM5464 support to broadcom PHY driver
cxgb3: Fix __must_check warning with dev_dbg.
tc35815: Statistics cleanup
natsemi: fix MMIO for PPC 44x platforms
[TIPC]: Cleanup of TIPC reference table code
[TIPC]: Optimized initialization of TIPC reference table
[TIPC]: Remove inlining of reference table locking routines
e1000: convert uint16_t style integers to u16
ixgb: convert uint16_t style integers to u16
sb1000.c: make const arrays static
sb1000.c: stop inlining largish static functions
...
Diffstat (limited to 'net/ipx/af_ipx.c')
-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 c76a9523091b..81ae8735f5e3 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->nd_net != &init_net) | 338 | if (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->nd_net != &init_net) | 1639 | if (dev_net(dev) != &init_net) |
1640 | goto drop; | 1640 | goto drop; |
1641 | 1641 | ||
1642 | /* Not ours */ | 1642 | /* Not ours */ |