diff options
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 5fc9d8d58ece..ac688fcb27d7 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -2629,7 +2629,7 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack | |||
2629 | unsigned char *arp_ptr; | 2629 | unsigned char *arp_ptr; |
2630 | __be32 sip, tip; | 2630 | __be32 sip, tip; |
2631 | 2631 | ||
2632 | if (dev->nd_net != &init_net) | 2632 | if (dev_net(dev) != &init_net) |
2633 | goto out; | 2633 | goto out; |
2634 | 2634 | ||
2635 | if (!(dev->priv_flags & IFF_BONDING) || !(dev->flags & IFF_MASTER)) | 2635 | if (!(dev->priv_flags & IFF_BONDING) || !(dev->flags & IFF_MASTER)) |
@@ -3470,7 +3470,7 @@ static int bond_netdev_event(struct notifier_block *this, unsigned long event, v | |||
3470 | { | 3470 | { |
3471 | struct net_device *event_dev = (struct net_device *)ptr; | 3471 | struct net_device *event_dev = (struct net_device *)ptr; |
3472 | 3472 | ||
3473 | if (event_dev->nd_net != &init_net) | 3473 | if (dev_net(event_dev) != &init_net) |
3474 | return NOTIFY_DONE; | 3474 | return NOTIFY_DONE; |
3475 | 3475 | ||
3476 | dprintk("event_dev: %s, event: %lx\n", | 3476 | dprintk("event_dev: %s, event: %lx\n", |
@@ -3508,7 +3508,7 @@ static int bond_inetaddr_event(struct notifier_block *this, unsigned long event, | |||
3508 | struct bonding *bond, *bond_next; | 3508 | struct bonding *bond, *bond_next; |
3509 | struct vlan_entry *vlan, *vlan_next; | 3509 | struct vlan_entry *vlan, *vlan_next; |
3510 | 3510 | ||
3511 | if (ifa->ifa_dev->dev->nd_net != &init_net) | 3511 | if (dev_net(ifa->ifa_dev->dev) != &init_net) |
3512 | return NOTIFY_DONE; | 3512 | return NOTIFY_DONE; |
3513 | 3513 | ||
3514 | list_for_each_entry_safe(bond, bond_next, &bond_dev_list, bond_list) { | 3514 | list_for_each_entry_safe(bond, bond_next, &bond_dev_list, bond_list) { |