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>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 85fb8220e28..d08362e1a0d 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -24,8 +24,8 @@
 #include "bond_3ad.h"
 #include "bond_alb.h"
 
-#define DRV_VERSION     "3.7.0"
-#define DRV_RELDATE     "June 2, 2010"
+#define DRV_VERSION     "3.7.1"
+#define DRV_RELDATE     "April 27, 2011"
 #define DRV_NAME        "bonding"
 #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
 
@@ -149,6 +149,7 @@ struct bond_params {
         int mode;
         int xmit_policy;
         int miimon;
+        u8 num_peer_notif;
         int arp_interval;
         int arp_validate;
         int use_carrier;
@@ -231,6 +232,7 @@ struct bonding {
         rwlock_t lock;
         rwlock_t curr_slave_lock;
         s8       kill_timers;
+        u8       send_peer_notif;
         s8       setup_by_slave;
         s8       igmp_retrans;
 #ifdef CONFIG_PROC_FS