summaryrefslogtreecommitdiffstats
path: root/net/8021q/vlan.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2011-04-15 13:47:51 +0000
committerDavid S. Miller <davem@davemloft.net>2011-04-17 23:36:03 -0700
commit7c89943236750537d26421d9bbb6f6575e2d1e1b (patch)
treedfbc9b11ddcd20757388b03e9925363c1e1764f3 /net/8021q/vlan.c
parent99606477a5888b0ead0284fecb13417b1da8e3af (diff)
downloadlinux-7c89943236750537d26421d9bbb6f6575e2d1e1b.tar.gz
linux-7c89943236750537d26421d9bbb6f6575e2d1e1b.tar.bz2
linux-7c89943236750537d26421d9bbb6f6575e2d1e1b.zip
bonding, ipv4, ipv6, vlan: Handle NETDEV_BONDING_FAILOVER like NETDEV_NOTIFY_PEERS
It is undesirable for the bonding driver to be poking into higher level protocols, and notifiers provide a way to avoid that. This does mean removing the ability to configure reptitition of gratuitous ARPs and unsolicited NAs. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan.c')
-rw-r--r--net/8021q/vlan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index b2ff70fcf8ea..969e7004cf86 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -501,13 +501,14 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
return NOTIFY_BAD;
case NETDEV_NOTIFY_PEERS:
+ case NETDEV_BONDING_FAILOVER:
/* Propagate to vlan devices */
for (i = 0; i < VLAN_N_VID; i++) {
vlandev = vlan_group_get_device(grp, i);
if (!vlandev)
continue;
- call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, vlandev);
+ call_netdevice_notifiers(event, vlandev);
}
break;
}