diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-25 19:43:59 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-25 19:43:59 -0700 |
commit | dfe98e9214ced45cd1a6ecd19f2627819a630f77 (patch) | |
tree | 4a229937bc32c470ebb75a51bdd39572d91ac0ce /drivers/net/bonding/bond_alb.c | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.26 (diff) | |
parent | [NET] NETNS: Omit namespace comparision without CONFIG_NET_NS. (diff) | |
download | linux-dev-dfe98e9214ced45cd1a6ecd19f2627819a630f77.tar.xz linux-dev-dfe98e9214ced45cd1a6ecd19f2627819a630f77.zip |
Merge branch 'net-2.6.26-netns-20080326' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev
Diffstat (limited to 'drivers/net/bonding/bond_alb.c')
-rw-r--r-- | drivers/net/bonding/bond_alb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index b57bc9467dbe..b986dacf5d33 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -345,7 +345,7 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct struct arp_pkt *arp = (struct arp_pkt *)skb->data; int res = NET_RX_DROP; - if (bond_dev->nd_net != &init_net) + if (dev_net(bond_dev) != &init_net) goto out; if (!(bond_dev->flags & IFF_MASTER)) |