aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_ipv6.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@aristanetworks.com>2009-10-29 10:18:26 -0400
committerDavid S. Miller <davem@davemloft.net>2009-10-30 15:41:21 -0400
commitec87fd3b4e111e8bc367d247a963e27e5b86df26 (patch)
tree8c33611b3e0afb37bcad232c2ad8d8f52d469634 /drivers/net/bonding/bond_ipv6.c
parent88ead977109da926a03068e277869ea8fedd170d (diff)
bond: Add support for multiple network namespaces
Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_ipv6.c')
-rw-r--r--drivers/net/bonding/bond_ipv6.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_ipv6.c b/drivers/net/bonding/bond_ipv6.c
index 83921abae12d..b72e1dc8cf8f 100644
--- a/drivers/net/bonding/bond_ipv6.c
+++ b/drivers/net/bonding/bond_ipv6.c
@@ -25,6 +25,7 @@
25#include <net/ipv6.h> 25#include <net/ipv6.h>
26#include <net/ndisc.h> 26#include <net/ndisc.h>
27#include <net/addrconf.h> 27#include <net/addrconf.h>
28#include <net/netns/generic.h>
28#include "bonding.h" 29#include "bonding.h"
29 30
30/* 31/*
@@ -152,11 +153,9 @@ static int bond_inet6addr_event(struct notifier_block *this,
152 struct net_device *vlan_dev, *event_dev = ifa->idev->dev; 153 struct net_device *vlan_dev, *event_dev = ifa->idev->dev;
153 struct bonding *bond; 154 struct bonding *bond;
154 struct vlan_entry *vlan; 155 struct vlan_entry *vlan;
156 struct bond_net *bn = net_generic(dev_net(event_dev), bond_net_id);
155 157
156 if (dev_net(event_dev) != &init_net) 158 list_for_each_entry(bond, &bn->dev_list, bond_list) {
157 return NOTIFY_DONE;
158
159 list_for_each_entry(bond, &bond_dev_list, bond_list) {
160 if (bond->dev == event_dev) { 159 if (bond->dev == event_dev) {
161 switch (event) { 160 switch (event) {
162 case NETDEV_UP: 161 case NETDEV_UP: