diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2011-04-15 13:47:51 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-17 23:36:03 -0700 |
| commit | 7c89943236750537d26421d9bbb6f6575e2d1e1b (patch) | |
| tree | dfbc9b11ddcd20757388b03e9925363c1e1764f3 /net | |
| parent | 99606477a5888b0ead0284fecb13417b1da8e3af (diff) | |
| download | kernel_samsung_smdk4412-7c89943236750537d26421d9bbb6f6575e2d1e1b.zip kernel_samsung_smdk4412-7c89943236750537d26421d9bbb6f6575e2d1e1b.tar.gz kernel_samsung_smdk4412-7c89943236750537d26421d9bbb6f6575e2d1e1b.tar.bz2 | |
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')
| -rw-r--r-- | net/8021q/vlan.c | 3 | ||||
| -rw-r--r-- | net/ipv4/devinet.c | 1 | ||||
| -rw-r--r-- | net/ipv6/ndisc.c | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index b2ff70f..969e700 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; } diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 5345b0b..acf553f 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -1203,6 +1203,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, break; /* fall through */ case NETDEV_NOTIFY_PEERS: + case NETDEV_BONDING_FAILOVER: /* Send gratuitous ARP to notify of link change */ inetdev_send_gratuitous_arp(dev, in_dev); break; diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 62cbd15..01a0ffc 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -1747,6 +1747,7 @@ static int ndisc_netdev_event(struct notifier_block *this, unsigned long event, fib6_run_gc(~0UL, net); break; case NETDEV_NOTIFY_PEERS: + case NETDEV_BONDING_FAILOVER: ndisc_send_unsol_na(dev); break; default: |