diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2011-04-26 15:25:52 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-29 12:44:11 -0700 |
| commit | ad246c992bea6d33c6421ba1f03e2b405792adf9 (patch) | |
| tree | 28afc1b370d856a63a3cd792fc292996c0315c13 /net/ipv6/ndisc.c | |
| parent | 7d36a991e8d36b8ae87e2aa1158d3735e656253b (diff) | |
| download | linux-3.10-ad246c992bea6d33c6421ba1f03e2b405792adf9.tar.gz linux-3.10-ad246c992bea6d33c6421ba1f03e2b405792adf9.tar.bz2 linux-3.10-ad246c992bea6d33c6421ba1f03e2b405792adf9.zip | |
ipv4, ipv6, bonding: Restore control over number of peer notifications
For backward compatibility, we should retain the module parameters and
sysfs attributes to control the number of peer notifications
(gratuitous ARPs and unsolicited NAs) sent after bonding failover.
Also, it is possible for failover to take place even though the new
active slave does not have link up, and in that case the peer
notification should be deferred until it does.
Change ipv4 and ipv6 so they do not automatically send peer
notifications on bonding failover.
Change the bonding driver to send separate NETDEV_NOTIFY_PEERS
notifications when the link is up, as many times as requested. Since
it does not directly control which protocols send notifications, make
num_grat_arp and num_unsol_na aliases for a single parameter. Bump
the bonding version number and update its documentation.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Acked-by: Brian Haley <brian.haley@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ndisc.c')
| -rw-r--r-- | net/ipv6/ndisc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 69aacd18e06..7596f071d30 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -1747,7 +1747,6 @@ 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: |