git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
drivers
/
net
/
bonding
/
bond_3ad.c
diff --git
a/drivers/net/bonding/bond_3ad.c
b/drivers/net/bonding/bond_3ad.c
index
d16e0e1
..
ebb539e
100644
(file)
--- a/
drivers/net/bonding/bond_3ad.c
+++ b/
drivers/net/bonding/bond_3ad.c
@@
-2429,7
+2429,7
@@
int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac
struct slave *slave = NULL;
int ret = NET_RX_DROP;
- if (dev
->nd_net
!= &init_net)
+ if (dev
_net(dev)
!= &init_net)
goto out;
if (!(dev->flags & IFF_MASTER))