Bonding patches for 2.6.31
Subsystems (3)
cover Bonding patches for 2.6.31
I started implementing a netlink interface to bonding, and quickly saw lots of things that need to be cleaned up first.
PATCH 1/9 bonding: bond_create always called with default parameters
bond_create() is always called with same parameters so move the argument down.
drivers/net/bonding/bond_main.c +6 -6
@@ -101,7 +101,7 @@ static int arp_interval = BOND_LINK_ARP_static char *arp_ip_target[BOND_MAX_ARP_TARGETS ] = {NULL , };static char *arp_validate =NULL ;static char *fail_over_mac =NULL ; -struct bond_params bonding_defaults; +static struct bond_params bonding_defaults;module_param (max_bonds, int,0 );MODULE_PARM_DESC (max_bonds,"Max number of bonded devices" );
@@ -4592,7 +4592,7 @@ static const struct net_device_ops bond_* Does not allocate but creates a /proc entry. * Allowed to fail. */ -static int bond_init (struct net_device *bond_dev,struct bond_params *params) +static int bond_init (struct net_device *bond_dev) {struct bonding *bond =netdev_priv (bond_dev);
@@ -4602,7 +4602,7 @@ static int bond_init(struct net_device *rwlock_init (&bond->lock);rwlock_init (&bond->curr_slave_lock); - bond->params = *params;/* copy params struct */ + bond->params = bonding_defaults; bond->wq =create_singlethread_workqueue (bond_dev->name);if (!bond->wq)
@@ -5116,7 +5116,7 @@ static void bond_set_lockdep_class(struc* Caller must NOT hold rtnl_lock; we need to release it here before we * set up our sysfs entries. */ -int bond_create (char *name,struct bond_params *params) +int bond_create (const char *name) {struct net_device *bond_dev;struct bonding *bond;
@@ -5159,7 +5159,7 @@ int bond_create(char *name, struct bond_* need to set function pointers. */ - res =bond_init (bond_dev, params); + res =bond_init (bond_dev);if (res <0 ) { goto out_netdev; }
@@ -5212,7 +5212,7 @@ static int __init bonding_init(void)init_rwsem (&bonding_rwsem);for (i =0 ; i < max_bonds; i++) { - res =bond_create (NULL , &bonding_defaults); + res =bond_create (NULL );if (res) goto err; }
drivers/net/bonding/bond_sysfs.c +1 -1
@@ -112,7 +112,7 @@ static ssize_t bonding_store_bonds(strucif (command[0 ] =='+' ) { printk(KERN_INFO DRV_NAME ": %s is being created...\n", ifname); - rv =bond_create (ifname, &bonding_defaults); + rv =bond_create (ifname);if (rv) { printk(KERN_INFO DRV_NAME ": Bond creation failed.\n"); res = rv;
drivers/net/bonding/bonding.h +1 -2
@@ -321,7 +321,7 @@ static inline void bond_unset_master_albstruct vlan_entry *bond_next_vlan (struct bonding *bond,struct vlan_entry *curr);int bond_dev_queue_xmit (struct bonding *bond,struct sk_buff *skb,struct net_device *slave_dev); -int bond_create (char *name,struct bond_params *params); +int bond_create (const char *name);void bond_destroy (struct bonding *bond);int bond_release_and_destroy (struct net_device *bond_dev,struct net_device *slave_dev);int bond_create_sysfs (void );
@@ -349,7 +349,6 @@ extern const struct bond_parm_tbl bond_mextern const struct bond_parm_tbl xmit_hashtype_tbl[];extern const struct bond_parm_tbl arp_validate_tbl[];extern const struct bond_parm_tbl fail_over_mac_tbl[]; -extern struct bond_params bonding_defaults;extern struct bond_parm_tbl ad_select_tbl[];/* exported from bond_sysfs.c */
PATCH 2/9 bonding: initialize before registration
In reply to Stephen HemmingerAvoid a unnecessary carrier state transistion that happens when device is registered.
Lockdep works better if initialization is done before registration as well.
drivers/net/bonding/bond_main.c +4 -4
@@ -5164,15 +5164,15 @@ int bond_create(const char *name) goto out_netdev; } +bond_set_lockdep_class (bond_dev); + +netif_carrier_off (bond_dev); + res =register_netdevice (bond_dev);if (res <0 ) { goto out_bond; } -bond_set_lockdep_class (bond_dev); - -netif_carrier_off (bond_dev); -up_write (&bonding_rwsem);rtnl_unlock ();/* allows sysfs registration of net device */ res =bond_create_sysfs_entry (netdev_priv (bond_dev));
PATCH 3/9 Subjec: bonding: remove bonding read/write semaphore
In reply to Stephen HemmingerThe whole read/write semaphore locking can be removed. It doesn't add any protection that isn't already done by using the RTNL mutex properly.
drivers/net/bonding/bond_main.c +3 -13
@@ -3489,10 +3489,10 @@ static int bond_event_changename(struct {bond_remove_proc_entry (bond);bond_create_proc_entry (bond); -down_write (&(bonding_rwsem)); +bond_destroy_sysfs_entry (bond);bond_create_sysfs_entry (bond); -up_write (&(bonding_rwsem)); +return NOTIFY_DONE ; }
@@ -4015,7 +4015,6 @@ static int bond_do_ioctl(struct net_devireturn -EPERM ; } -down_write (&(bonding_rwsem)); slave_dev =dev_get_by_name (&init_net, ifr->ifr_slave);pr_debug ("slave_dev=%p: \n" , slave_dev);
@@ -4048,7 +4047,6 @@ static int bond_do_ioctl(struct net_devidev_put (slave_dev); } -up_write (&(bonding_rwsem));return res; }
@@ -5123,8 +5121,6 @@ int bond_create(const char *name)int res;rtnl_lock (); -down_write (&bonding_rwsem); -/* Check to see if the bond already exists. */ if (name) {list_for_each_entry (bond, &bond_dev_list, bond_list)
@@ -5173,24 +5169,20 @@ int bond_create(const char *name) goto out_bond; } -up_write (&bonding_rwsem); -rtnl_unlock ();/* allows sysfs registration of net device */ res =bond_create_sysfs_entry (netdev_priv (bond_dev));if (res <0 ) goto out_unreg; +rtnl_unlock ();return 0 ; out_unreg: -rtnl_lock (); -down_write (&bonding_rwsem);unregister_netdevice (bond_dev); out_bond:bond_deinit (bond_dev); out_netdev:free_netdev (bond_dev); out_rtnl: -up_write (&bonding_rwsem);rtnl_unlock ();return res; }
@@ -5209,8 +5201,6 @@ static int __init bonding_init(void)bond_create_proc_dir (); -init_rwsem (&bonding_rwsem); -for (i =0 ; i < max_bonds; i++) { res =bond_create (NULL );if (res)
drivers/net/bonding/bond_sysfs.c +3 -20
@@ -44,20 +44,6 @@/*---------------------------- Declarations -------------------------------*/ static int expected_refcount =-1 ; -/*--------------------------- Data Structures -----------------------------*/ - -/* Bonding sysfs lock. Why can't we just use the subsystem lock? -* Because kobject_register tries to acquire the subsystem lock. If -* we already hold the lock (which we would if the user was creating -* a new bond through the sysfs interface), we deadlock. -* This lock is only needed when deleting a bond - we need to make sure -* that we don't collide with an ongoing ioctl. -*/ - -struct rw_semaphore bonding_rwsem; - - -/*------------------------------ Functions --------------------------------*/
@@ -70,7 +56,7 @@ static ssize_t bonding_show_bonds(structint res =0 ;struct bonding *bond; -down_read (&(bonding_rwsem)); +rtnl_lock ();list_for_each_entry (bond, &bond_dev_list, bond_list) {if (res > (PAGE_SIZE -IFNAMSIZ )) {
@@ -84,7 +70,8 @@ static ssize_t bonding_show_bonds(struct }if (res) buf[res-1 ] ='\n' ;/* eat the leftover space */ -up_read (&(bonding_rwsem)); + +rtnl_unlock ();return res; }
@@ -122,7 +109,6 @@ static ssize_t bonding_store_bonds(strucif (command[0 ] =='-' ) {rtnl_lock (); -down_write (&bonding_rwsem);list_for_each_entry (bond, &bond_dev_list, bond_list)if (strnicmp (bond->dev->name, ifname,IFNAMSIZ ) ==0 ) {
@@ -157,7 +143,6 @@ err_no_cmd:return -EPERM ; out_unlock: -up_write (&bonding_rwsem);rtnl_unlock ();/* Always return either count or an error. If you return 0, you'll
@@ -253,7 +238,6 @@ static ssize_t bonding_store_slaves(struif (!rtnl_trylock ())return restart_syscall (); -down_write (&(bonding_rwsem));sscanf (buffer,"%16s" , command);/* IFNAMSIZ*/ ifname = command +1 ;
@@ -357,7 +341,6 @@ err_no_cmd: ret = -EPERM ; out: -up_write (&(bonding_rwsem));rtnl_unlock ();return ret; }
drivers/net/bonding/bonding.h +0 -3
@@ -351,9 +351,6 @@ extern const struct bond_parm_tbl arp_vaextern const struct bond_parm_tbl fail_over_mac_tbl[];extern struct bond_parm_tbl ad_select_tbl[]; -/* exported from bond_sysfs.c */ -extern struct rw_semaphore bonding_rwsem; -#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE )void bond_send_unsolicited_na (struct bonding *bond);void bond_register_ipv6_notifier (void );
PATCH 4/9 bonding: fix destructor
In reply to Stephen HemmingerIt is not safe to use a network device destructor that is a function in the module, since it can be called after module is unloaded if sysfs handle is open.
When eventually using netlink, the device cleanup code needs to be donen via uninit function.
drivers/net/bonding/bond_sysfs.c +1 -1
@@ -127,7 +127,7 @@ static ssize_t bonding_store_bonds(struc printk(KERN_INFO DRV_NAME": %s is being deleted...\n" , bond->dev->name); -bond_destroy (bond); +unregister_netdevice (bond->dev); goto out_unlock; }
drivers/net/bonding/bonding.h +0 -1
@@ -322,7 +322,6 @@ static inline void bond_unset_master_albstruct vlan_entry *bond_next_vlan (struct bonding *bond,struct vlan_entry *curr);int bond_dev_queue_xmit (struct bonding *bond,struct sk_buff *skb,struct net_device *slave_dev);int bond_create (const char *name); -void bond_destroy (struct bonding *bond);int bond_release_and_destroy (struct net_device *bond_dev,struct net_device *slave_dev);int bond_create_sysfs (void );void bond_destroy_sysfs (void );
drivers/net/bonding/bond_main.c +8 -13
@@ -1972,25 +1972,19 @@ int bond_release(struct net_device *bond* Destroy a bonding device. * Must be under rtnl_lock when this function is called. */ -void bond_destroy (struct bonding *bond) -{ -bond_deinit (bond->dev); -bond_destroy_sysfs_entry (bond); -unregister_netdevice (bond->dev); -} - -static void bond_destructor (struct net_device *bond_dev) +static void bond_uninit (struct net_device *bond_dev) {struct bonding *bond =netdev_priv (bond_dev); +bond_deinit (bond_dev); +bond_destroy_sysfs_entry (bond); +if (bond->wq)destroy_workqueue (bond->wq);netif_addr_lock_bh (bond_dev);bond_mc_list_destroy (bond);netif_addr_unlock_bh (bond_dev); - -free_netdev (bond_dev); }/*
@@ -2006,7 +2000,7 @@ int bond_release_and_destroy(struct netif ((ret ==0 ) && (bond->slave_cnt ==0 )) { printk(KERN_INFO DRV_NAME ": %s: destroying bond %s.\n", bond_dev->name, bond_dev->name); -bond_destroy (bond); +unregister_netdevice (bond_dev); }return ret; }
@@ -4572,6 +4566,7 @@ static const struct ethtool_ops bond_eth };static const struct net_device_ops bond_netdev_ops = { + .ndo_uninit = bond_uninit, .ndo_open = bond_open, .ndo_stop = bond_close, .ndo_start_xmit = bond_start_xmit,
@@ -4622,7 +4617,7 @@ static int bond_init(struct net_device * bond_dev->ethtool_ops = &bond_ethtool_ops;bond_set_mode_ops (bond, bond->params.mode); - bond_dev->destructor = bond_destructor; + bond_dev->destructor = free_netdev;/* Initialize the device options */ bond_dev->tx_queue_len =0 ;
@@ -4706,7 +4701,7 @@ static void bond_free_all(void)bond_work_cancel_all (bond);/* Release the bonded slaves */ bond_release_all (bond_dev); -bond_destroy (bond); +unregister_netdevice (bond_dev); }bond_destroy_proc_dir ();
PATCH 5/9 bonding: fix style issues
In reply to Stephen HemmingerResolve some of the complaints from checkpatch, and remove "magic emacs format" comments, and useless MODULE_SUPPORTED_DEVICE(). But should not change actual code.
--- drivers/net/bonding/bond_main.c | 633 +++++++++++++++++---------------------- drivers/net/bonding/bond_sysfs.c | 324 ++++++++++--------- 2 files changed, 460 insertions(+), 497 deletions(-)
drivers/net/bonding/bond_main.c +285 -348
@@ -51,10 +51,10 @@#include <linux/ctype.h> #include <linux/inet.h> #include <linux/bitops.h> +#include <linux/io.h> #include <asm/system.h> -#include <asm/io.h> #include <asm/dma.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/errno.h> #include <linux/netdevice.h> #include <linux/inetdevice.h>
@@ -89,18 +89,18 @@ static int max_bonds = BOND_DEFAULT_MAX_static int num_grat_arp =1 ;static int num_unsol_na =1 ;static int miimon =BOND_LINK_MON_INTERV ; -static int updelay =0 ; -static int downdelay =0 ; +static int updelay; +static int downdelay;static int use_carrier =1 ; -static char *mode =NULL ; -static char *primary =NULL ; -static char *lacp_rate =NULL ; -static char *ad_select =NULL ; -static char *xmit_hash_policy =NULL ; +static char *mode; +static char *primary; +static char *lacp_rate; +static char *ad_select; +static char *xmit_hash_policy;static int arp_interval =BOND_LINK_ARP_INTERV ; -static char *arp_ip_target[BOND_MAX_ARP_TARGETS ] = {NULL , }; -static char *arp_validate =NULL ; -static char *fail_over_mac =NULL ; +static char *arp_ip_target[BOND_MAX_ARP_TARGETS ]; +static char *arp_validate; +static char *fail_over_mac;static struct bond_params bonding_defaults;module_param (max_bonds, int,0 );
@@ -151,14 +151,14 @@ static const char * const version =LIST_HEAD (bond_dev_list);#ifdef CONFIG_PROC_FS -static struct proc_dir_entry *bond_proc_dir =NULL ; +static struct proc_dir_entry *bond_proc_dir;#endif -static __be32 arp_target[BOND_MAX_ARP_TARGETS ] = {0 , } ; -static int arp_ip_count =0 ; +static __be32 arp_target[BOND_MAX_ARP_TARGETS ]; +static int arp_ip_count;static int bond_mode =BOND_MODE_ROUNDROBIN ; -static int xmit_hashtype=BOND_XMIT_POLICY_LAYER2 ; -static int lacp_fast =0 ; +static int xmit_hashtype =BOND_XMIT_POLICY_LAYER2 ; +static int lacp_fast;const struct bond_parm_tbl bond_lacp_tbl[] = {
@@ -221,7 +221,7 @@ static const char *bond_mode_name(int mo [BOND_MODE_ACTIVEBACKUP] = "fault-tolerance (active-backup)", [BOND_MODE_XOR] = "load balancing (xor)", [BOND_MODE_BROADCAST] = "fault-tolerance (broadcast)", - [BOND_MODE_8023AD]= "IEEE 802.3ad Dynamic link aggregation", + [BOND_MODE_8023AD] = "IEEE 802.3ad Dynamic link aggregation", [BOND_MODE_TLB] = "transmit load balancing", [BOND_MODE_ALB] = "adaptive load balancing", };
@@ -246,12 +246,11 @@ static int bond_add_vlan(struct bondingstruct vlan_entry *vlan;pr_debug ("bond: %s, vlan id %d\n" , - (bond ? bond->dev->name:"None" ), vlan_id); + (bond ? bond->dev->name :"None" ), vlan_id); vlan =kzalloc (sizeof (struct vlan_entry ),GFP_KERNEL ); -if (!vlan) { +if (!vlan)return -ENOMEM ; - }INIT_LIST_HEAD (&vlan->vlan_list); vlan->vlan_id = vlan_id;
@@ -351,16 +350,15 @@ static int bond_has_challenged_slaves(st* * Returns %NULL if list is empty, bond->next_vlan if @curr is %NULL, * or @curr->next otherwise (even if it is @curr itself again). -* +* * Caller must hold bond->lock */ struct vlan_entry *bond_next_vlan (struct bonding *bond,struct vlan_entry *curr) {struct vlan_entry *next, *last; -if (list_empty (&bond->vlan_list)) { +if (list_empty (&bond->vlan_list))return NULL ; - }if (!curr) { next = list_entry(bond->vlan_list.next,
@@ -382,11 +380,11 @@ struct vlan_entry *bond_next_vlan(struct/** * bond_dev_queue_xmit - Prepare skb for xmit. -* +* * @bond: bond device that got this skb for tx. * @skb: hw accel VLAN tagged skb to transmit * @slave_dev: slave that is supposed to xmit this skbuff -* +* * When the bond gets an skb to transmit that is * already hardware accelerated VLAN tagged, and it * needs to relay this skb to a slave that is not
@@ -394,7 +392,8 @@ struct vlan_entry *bond_next_vlan(struct* i.e. strip the hwaccel tag and re-insert it as part * of the payload. */ -int bond_dev_queue_xmit (struct bonding *bond,struct sk_buff *skb,struct net_device *slave_dev) +int bond_dev_queue_xmit (struct bonding *bond,struct sk_buff *skb, +struct net_device *slave_dev) {unsigned short uninitialized_var (vlan_id );
@@ -428,7 +427,7 @@ int bond_dev_queue_xmit(struct bonding ** b. The operation is protected by the RTNL semaphore in the 8021q code, * c. Holding a lock with BH disabled while directly calling a base driver * entry point is generally a BAD idea. -* +* * The design of synchronization/protection for this operation in the 8021q * module is good for one or more VLAN devices over a single physical device * and cannot be extended for a teaming solution like bonding, so there is a
@@ -443,7 +442,8 @@ int bond_dev_queue_xmit(struct bonding ** @bond_dev: bonding net device that got called * @grp: vlan group being registered */ -static void bond_vlan_rx_register (struct net_device *bond_dev,struct vlan_group *grp) +static void bond_vlan_rx_register (struct net_device *bond_dev, +struct vlan_group *grp) {struct bonding *bond =netdev_priv (bond_dev);struct slave *slave;
@@ -485,7 +485,7 @@ static void bond_vlan_rx_add_vid(struct res =bond_add_vlan (bond, vid);if (res) { - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": %s: Error: Failed to add vlan id %d\n" , bond_dev->name, vid); }
@@ -520,7 +520,7 @@ static void bond_vlan_rx_kill_vid(struct res =bond_del_vlan (bond, vid);if (res) { - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": %s: Error: Failed to remove vlan id %d\n" , bond_dev->name, vid); }
@@ -551,7 +551,8 @@ out:write_unlock_bh (&bond->lock); } -static void bond_del_vlans_from_slave (struct bonding *bond,struct net_device *slave_dev) +static void bond_del_vlans_from_slave (struct bonding *bond, +struct net_device *slave_dev) {const struct net_device_ops *slave_ops = slave_dev->netdev_ops;struct vlan_entry *vlan;
@@ -673,7 +674,7 @@ static int bond_update_speed_duplex(stru* if <dev> supports MII link status reporting, check its link status. * * We either do MII/ETHTOOL ioctls, or check netif_carrier_ok(), -* depening upon the setting of the use_carrier parameter. +* depending upon the setting of the use_carrier parameter. * * Return either BMSR_LSTATUS, meaning that the link is up (or we * can't tell and just pretend it is), or 0, meaning that the link is
@@ -685,10 +686,11 @@ static int bond_update_speed_duplex(stru* It'd be nice if there was a good way to tell if a driver supports * netif_carrier, but there really isn't. */ -static int bond_check_dev_link (struct bonding *bond,struct net_device *slave_dev,int reporting) +static int bond_check_dev_link (struct bonding *bond, +struct net_device *slave_dev,int reporting) {const struct net_device_ops *slave_ops = slave_dev->netdev_ops; -static int (* ioctl)(struct net_device *,struct ifreq *,int ); +static int (*ioctl)(struct net_device *,struct ifreq *,int );struct ifreq ifr;struct mii_ioctl_data *mii;
@@ -706,7 +708,7 @@ static int bond_check_dev_link(struct bo } } -/* Ethtool can't be used, fallback to MII ioclts. */ +/* Ethtool can't be used, fallback to MII ioctls. */ ioctl = slave_ops->ndo_do_ioctl;if (ioctl) {/* TODO: set pointer to correct ioctl on a per team member */
@@ -726,9 +728,8 @@ static int bond_check_dev_link(struct bo mii =if_mii (&ifr);if (IOCTL (slave_dev, &ifr,SIOCGMIIPHY ) ==0 ) { mii->reg_num =MII_BMSR ; -if (IOCTL (slave_dev, &ifr,SIOCGMIIREG ) ==0 ) { -return (mii->val_out &BMSR_LSTATUS ); - } +if (IOCTL (slave_dev, &ifr,SIOCGMIIREG ) ==0 ) +return mii->val_out &BMSR_LSTATUS ; } }
@@ -738,7 +739,7 @@ static int bond_check_dev_link(struct bo* cannot report link status). If not reporting, pretend * we're ok. */ -return (reporting ?-1 :BMSR_LSTATUS ); +return reporting ?-1 :BMSR_LSTATUS ; }/*----------------------------- Multicast list ------------------------------*/
@@ -746,7 +747,8 @@ static int bond_check_dev_link(struct bo/* * Returns 0 if dmi1 and dmi2 are the same, non-0 otherwise */ -static inline int bond_is_dmi_same (struct dev_mc_list *dmi1,struct dev_mc_list *dmi2) +static inline int bond_is_dmi_same (const struct dev_mc_list *dmi1, +const struct dev_mc_list *dmi2) {return memcmp (dmi1->dmi_addr, dmi2->dmi_addr, dmi1->dmi_addrlen) ==0 && dmi1->dmi_addrlen == dmi2->dmi_addrlen;
@@ -755,14 +757,14 @@ static inline int bond_is_dmi_same(struc/* * returns dmi entry if found, NULL otherwise */ -static struct dev_mc_list *bond_mc_list_find_dmi (struct dev_mc_list *dmi,struct dev_mc_list *mc_list) +static struct dev_mc_list *bond_mc_list_find_dmi (struct dev_mc_list *dmi, +struct dev_mc_list *mc_list) {struct dev_mc_list *idmi;for (idmi = mc_list; idmi; idmi = idmi->next) { -if (bond_is_dmi_same (dmi, idmi)) { +if (bond_is_dmi_same (dmi, idmi))return idmi; - } }return NULL ;
@@ -824,15 +826,14 @@ static void bond_mc_add(struct bonding * {if (USES_PRIMARY (bond->params.mode)) {/* write lock already acquired */ -if (bond->curr_active_slave) { +if (bond->curr_active_slave)dev_mc_add (bond->curr_active_slave->dev, addr, alen,0 ); - } }else {struct slave *slave;int i; -bond_for_each_slave (bond, slave, i) { + +bond_for_each_slave (bond, slave, i)dev_mc_add (slave->dev, addr, alen,0 ); - } } }
@@ -844,9 +845,9 @@ static void bond_mc_delete(struct bondin {if (USES_PRIMARY (bond->params.mode)) {/* write lock already acquired */ -if (bond->curr_active_slave) { -dev_mc_delete (bond->curr_active_slave->dev, addr, alen,0 ); - } +if (bond->curr_active_slave) +dev_mc_delete (bond->curr_active_slave->dev, addr, + alen,0 ); }else {struct slave *slave;int i;
@@ -870,9 +871,8 @@ static void bond_resend_igmp_join_requesrcu_read_lock (); in_dev =__in_dev_get_rcu (bond->dev);if (in_dev) { -for (im = in_dev->mc_list; im; im = im->next) { +for (im = in_dev->mc_list; im; im = im->next)ip_mc_rejoin_group (im); - } }rcu_read_unlock ();
@@ -891,7 +891,8 @@ static void bond_mc_list_destroy(structkfree (dmi); dmi = bond->mc_list; } - bond->mc_list =NULL ; + + bond->mc_list =NULL ; }/*
@@ -924,14 +925,14 @@ static int bond_mc_list_copy(struct dev_/* * flush all members of flush->mc_list from device dev->mc_list */ -static void bond_mc_list_flush (struct net_device *bond_dev,struct net_device *slave_dev) +static void bond_mc_list_flush (struct net_device *bond_dev, +struct net_device *slave_dev) {struct bonding *bond =netdev_priv (bond_dev);struct dev_mc_list *dmi; -for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next) { +for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next)dev_mc_delete (slave_dev, dmi->dmi_addr, dmi->dmi_addrlen,0 ); - }if (bond->params.mode ==BOND_MODE_8023AD ) {/* del lacpdu mc addr from mc list */
@@ -948,44 +949,40 @@ static void bond_mc_list_flush(struct ne* old active slaves (if any) according to the multicast mode, and * promiscuous flags unconditionally. */ -static void bond_mc_swap (struct bonding *bond,struct slave *new_active,struct slave *old_active) +static void bond_mc_swap (struct bonding *bond,struct slave *new_active, +struct slave *old_active) {struct dev_mc_list *dmi; -if (!USES_PRIMARY (bond->params.mode)) { +if (!USES_PRIMARY (bond->params.mode))/* nothing to do - mc list is already up-to-date on * all slaves */ return ; - }if (old_active) { -if (bond->dev->flags &IFF_PROMISC ) { +if (bond->dev->flags &IFF_PROMISC )dev_set_promiscuity (old_active->dev,-1 ); - } -if (bond->dev->flags &IFF_ALLMULTI ) { +if (bond->dev->flags &IFF_ALLMULTI )dev_set_allmulti (old_active->dev,-1 ); - } -for (dmi = bond->dev->mc_list; dmi; dmi = dmi->next) { -dev_mc_delete (old_active->dev, dmi->dmi_addr, dmi->dmi_addrlen,0 ); - } +for (dmi = bond->dev->mc_list; dmi; dmi = dmi->next) +dev_mc_delete (old_active->dev, dmi->dmi_addr, + dmi->dmi_addrlen,0 ); }if (new_active) {/* FIXME: Signal errors upstream. */ -if (bond->dev->flags &IFF_PROMISC ) { +if (bond->dev->flags &IFF_PROMISC )dev_set_promiscuity (new_active->dev,1 ); - } -if (bond->dev->flags &IFF_ALLMULTI ) { +if (bond->dev->flags &IFF_ALLMULTI )dev_set_allmulti (new_active->dev,1 ); - } -for (dmi = bond->dev->mc_list; dmi; dmi = dmi->next) { -dev_mc_add (new_active->dev, dmi->dmi_addr, dmi->dmi_addrlen,0 ); - } +for (dmi = bond->dev->mc_list; dmi; dmi = dmi->next) +dev_mc_add (new_active->dev, dmi->dmi_addr, + dmi->dmi_addrlen,0 );bond_resend_igmp_join_requests (bond); } }
@@ -1039,7 +1036,7 @@ static void bond_do_fail_over_mac(struct rv =dev_set_mac_address (new_active->dev, &saddr);if (rv) { - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": %s: Error %d setting MAC of slave %s\n" , bond->dev->name, -rv, new_active->dev->name); goto out;
@@ -1053,7 +1050,7 @@ static void bond_do_fail_over_mac(struct rv =dev_set_mac_address (old_active->dev, &saddr);if (rv) - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": %s: Error %d setting MAC of slave %s\n" , bond->dev->name, -rv, new_active->dev->name); out:
@@ -1061,7 +1058,7 @@ out:write_lock_bh (&bond->curr_slave_lock);break ;default : - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": %s: bond_do_fail_over_mac impossible: bad policy %d\n" , bond->dev->name, bond->params.fail_over_mac);break ;
@@ -1086,17 +1083,17 @@ static struct slave *bond_find_best_slav new_active = old_active = bond->curr_active_slave;if (!new_active) {/* there were no active slaves left */ -if (bond->slave_cnt >0 ) {/* found one slave */ +if (bond->slave_cnt >0 )/* found one slave */ new_active = bond->first_slave; - }else { +else return NULL ;/* still no slave, return NULL */ - } } -/* first try the primary link; if arping, a link must tx/rx traffic -* before it can be considered the curr_active_slave - also, we would skip -* slaves between the curr_active_slave and primary_slave that may be up -* and able to arp +/* +* first try the primary link; if arping, a link must tx/rx +* traffic before it can be considered the curr_active_slave. +* also, we would skip slaves between the curr_active_slave +* and primary_slave that may be up and able to arp */ if ((bond->primary_slave) && (!bond->params.arp_interval) &&
@@ -1144,16 +1141,15 @@ void bond_change_active_slave(struct bon {struct slave *old_active = bond->curr_active_slave; -if (old_active == new_active) { +if (old_active == new_active)return ; - }if (new_active) { new_active->jiffies = jiffies;if (new_active->link ==BOND_LINK_BACK ) {if (USES_PRIMARY (bond->params.mode)) { - printk(KERN_INFO DRV_NAME + pr_info(DRV_NAME ": %s: making interface %s the new " "active one %d ms earlier.\n", bond->dev->name, new_active->dev->name,
@@ -1163,15 +1159,14 @@ void bond_change_active_slave(struct bon new_active->delay =0 ; new_active->link =BOND_LINK_UP ; -if (bond->params.mode ==BOND_MODE_8023AD ) { +if (bond->params.mode ==BOND_MODE_8023AD )bond_3ad_handle_link_change (new_active,BOND_LINK_UP ); - }if (bond_is_lb (bond))bond_alb_handle_link_change (bond, new_active,BOND_LINK_UP ); }else {if (USES_PRIMARY (bond->params.mode)) { - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: making interface %s the new " "active one.\n" , bond->dev->name, new_active->dev->name);
@@ -1179,9 +1174,8 @@ void bond_change_active_slave(struct bon } } -if (USES_PRIMARY (bond->params.mode)) { +if (USES_PRIMARY (bond->params.mode))bond_mc_swap (bond, new_active, old_active); - }if (bond_is_lb (bond)) {bond_alb_handle_active_change (bond, new_active);
@@ -1194,9 +1188,8 @@ void bond_change_active_slave(struct bon }if (bond->params.mode ==BOND_MODE_ACTIVEBACKUP ) { -if (old_active) { +if (old_active)bond_set_slave_inactive_flags (old_active); - }if (new_active) {bond_set_slave_active_flags (new_active);
@@ -1226,7 +1219,7 @@ void bond_change_active_slave(struct bon* bond_select_active_slave - select a new active slave, if needed * @bond: our bonding struct * -* This functions shoud be called when one of the following occurs: +* This functions should be called when one of the following occurs: * - The old curr_active_slave has been released or lost its link. * - The primary_slave has got its link back. * - A slave has got its link back and there's no old curr_active_slave.
@@ -1246,11 +1239,11 @@ void bond_select_active_slave(struct bonreturn ;if (netif_carrier_ok (bond->dev)) { - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: first active interface up!\n" , bond->dev->name); }else { - printk(KERN_INFO DRV_NAME ": %s: " +pr_info (DRV_NAME ": %s: " "now running without any active interface !\n" , bond->dev->name); }
@@ -1292,13 +1285,11 @@ static void bond_attach_slave(struct bon*/ static void bond_detach_slave (struct bonding *bond,struct slave *slave) { -if (slave->next) { +if (slave->next) slave->next->prev = slave->prev; - } -if (slave->prev) { +if (slave->prev) slave->prev->next = slave->next; - }if (bond->first_slave == slave) {/* slave is the first slave */ if (bond->slave_cnt >1 ) {/* there are more slave */
@@ -1329,7 +1320,7 @@ static int bond_sethwaddr(struct net_dev (NETIF_F_VLAN_CHALLENGED |NETIF_F_HW_VLAN_RX |NETIF_F_HW_VLAN_TX | \NETIF_F_HW_VLAN_FILTER ) -/* +/* * Compute the common dev->feature set available to all slaves. Some * feature bits are managed elsewhere, so preserve those feature bits * on the master device.
@@ -1397,14 +1388,14 @@ int bond_enslave(struct net_device *bondif (!bond->params.use_carrier && slave_dev->ethtool_ops ==NULL && slave_ops->ndo_do_ioctl ==NULL ) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": %s: Warning: no link monitoring support for %s\n" , bond_dev->name, slave_dev->name); }/* bond must be initialized by bond_open() before enslaving */ if (!(bond_dev->flags &IFF_UP )) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME " %s: master_dev is not up in bond_enslave\n" , bond_dev->name); }
@@ -1420,14 +1411,14 @@ int bond_enslave(struct net_device *bondif (slave_dev->features &NETIF_F_VLAN_CHALLENGED ) {pr_debug ("%s: NETIF_F_VLAN_CHALLENGED\n" , slave_dev->name);if (!list_empty (&bond->vlan_list)) { - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": %s: Error: cannot enslave VLAN " "challenged slave %s on VLAN enabled " "bond %s\n" , bond_dev->name, slave_dev->name, bond_dev->name);return -EPERM ; }else { - printk(KERN_WARNING DRV_NAME + pr_warning(DRV_NAME ": %s: Warning: enslaved VLAN challenged " "slave %s. Adding VLANs will be blocked as " "long as %s is part of bond %s\n",
@@ -1447,12 +1438,12 @@ int bond_enslave(struct net_device *bond/* * Old ifenslave binaries are no longer supported. These can -* be identified with moderate accurary by the state of the slave: +* be identified with moderate accuracy by the state of the slave: * the current ifenslave will set the interface down prior to * enslaving it; the old ifenslave will not. */ if ((slave_dev->flags &IFF_UP )) { - printk(KERN_ERR DRV_NAME ": %s is up. " +pr_err (DRV_NAME ": %s is up. " "This may be due to an out of date ifenslave.\n" , slave_dev->name); res = -EPERM ;
@@ -1470,7 +1461,7 @@ int bond_enslave(struct net_device *bondif (slave_dev->type !=ARPHRD_ETHER )bond_setup_by_slave (bond_dev, slave_dev); }else if (bond_dev->type != slave_dev->type) { - printk(KERN_ERR DRV_NAME ": %s ether type (%d) is different " +pr_err (DRV_NAME ": %s ether type (%d) is different " "from other slaves (%d), can not enslave it.\n" , slave_dev->name, slave_dev->type, bond_dev->type);
@@ -1480,14 +1471,14 @@ int bond_enslave(struct net_device *bondif (slave_ops->ndo_set_mac_address ==NULL ) {if (bond->slave_cnt ==0 ) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": %s: Warning: The first slave device " "specified does not support setting the MAC " "address. Setting fail_over_mac to active." , bond_dev->name); bond->params.fail_over_mac =BOND_FOM_ACTIVE ; }else if (bond->params.fail_over_mac !=BOND_FOM_ACTIVE ) { - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": %s: Error: The slave device specified " "does not support setting the MAC address, " "but fail_over_mac is not set to active.\n"
@@ -1537,7 +1528,7 @@ int bond_enslave(struct net_device *bond/* open the slave since the application closed it */ res =dev_open (slave_dev);if (res) { -pr_debug ("Openning slave %s failed\n" , slave_dev->name); +pr_debug ("Opening slave %s failed\n" , slave_dev->name); goto err_unset_master; }
@@ -1549,9 +1540,8 @@ int bond_enslave(struct net_device *bond* it might fail and we do not want to have to undo everything */ res =bond_alb_init_slave (bond, new_slave); -if (res) { +if (res) goto err_close; - } }/* If the mode USES_PRIMARY, then the new slave gets the
@@ -1576,9 +1566,9 @@ int bond_enslave(struct net_device *bondnetif_addr_lock_bh (bond_dev);/* upload master's mc_list to new slave */ -for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next) { -dev_mc_add (slave_dev, dmi->dmi_addr, dmi->dmi_addrlen,0 ); - } +for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next) +dev_mc_add (slave_dev, dmi->dmi_addr, + dmi->dmi_addrlen,0 );netif_addr_unlock_bh (bond_dev); }
@@ -1619,7 +1609,7 @@ int bond_enslave(struct net_device *bond* supported); thus, we don't need to change * the messages for netif_carrier. */ - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": %s: Warning: MII and ETHTOOL support not " "available for interface %s, and " "arp_interval/arp_ip_target module parameters "
@@ -1628,7 +1618,7 @@ int bond_enslave(struct net_device *bond bond_dev->name, slave_dev->name); }else if (link_reporting ==-1 ) {/* unable get link status using mii/ethtool */ - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": %s: Warning: can't get link status from " "interface %s; the network driver associated " "with this interface does not support MII or "
@@ -1660,13 +1650,13 @@ int bond_enslave(struct net_device *bondif (bond_update_speed_duplex (new_slave) && (new_slave->link !=BOND_LINK_DOWN )) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": %s: Warning: failed to get speed and duplex from %s, " "assumed to be 100Mb/sec and Full.\n" , bond_dev->name, new_slave->dev->name);if (bond->params.mode ==BOND_MODE_8023AD ) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": %s: Warning: Operation of 802.3ad mode requires ETHTOOL " "support in base driver for proper aggregator " "selection.\n" , bond_dev->name);
@@ -1675,9 +1665,8 @@ int bond_enslave(struct net_device *bondif (USES_PRIMARY (bond->params.mode) && bond->params.primary[0 ]) {/* if there is a primary slave, remember it */ -if (strcmp (bond->params.primary, new_slave->dev->name) ==0 ) { +if (strcmp (bond->params.primary, new_slave->dev->name) ==0 ) bond->primary_slave = new_slave; - } }write_lock_bh (&bond->curr_slave_lock);
@@ -1724,9 +1713,9 @@ int bond_enslave(struct net_device *bond* anyway (it holds no special properties of the bond device), * so we can change it without calling change_active_interface() */ -if (!bond->curr_active_slave) { +if (!bond->curr_active_slave) bond->curr_active_slave = new_slave; - } +break ; }/* switch(bond_mode) */
@@ -1740,7 +1729,7 @@ int bond_enslave(struct net_device *bondif (res) goto err_close; - printk(KERN_INFO DRV_NAME + pr_info(DRV_NAME ": %s: enslaving %s as a%s interface with a%s link.\n", bond_dev->name, slave_dev->name, new_slave->state == BOND_STATE_ACTIVE ? "n active" : " backup",
@@ -1772,7 +1761,7 @@ err_free: err_undo_flags: bond_dev->features = old_features; - +return res; }
@@ -1797,7 +1786,7 @@ int bond_release(struct net_device *bond/* slave is not a slave or master is not master of this slave */ if (!(slave_dev->flags &IFF_SLAVE ) || (slave_dev->master != bond_dev)) { - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": %s: Error: cannot release %s.\n" , bond_dev->name, slave_dev->name);return -EINVAL ;
@@ -1808,7 +1797,7 @@ int bond_release(struct net_device *bond slave =bond_get_slave_by_dev (bond, slave_dev);if (!slave) {/* not a slave of this bond */ - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: %s not enslaved\n" , bond_dev->name, slave_dev->name);write_unlock_bh (&bond->lock);
@@ -1819,7 +1808,7 @@ int bond_release(struct net_device *bond mac_addr_differ =memcmp (bond_dev->dev_addr, slave->perm_hwaddr,ETH_ALEN );if (!mac_addr_differ && (bond->slave_cnt >1 )) - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": %s: Warning: the permanent HWaddr of %s - " "%pM - is still in use by %s. " "Set the HWaddr of %s to a different address "
@@ -1837,7 +1826,7 @@ int bond_release(struct net_device *bondbond_3ad_unbind_slave (slave); } - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: releasing %s interface %s\n" , bond_dev->name, (slave->state == BOND_STATE_ACTIVE)
@@ -1853,13 +1842,11 @@ int bond_release(struct net_device *bondbond_compute_features (bond); -if (bond->primary_slave == slave) { +if (bond->primary_slave == slave) bond->primary_slave =NULL ; - } -if (oldcurrent == slave) { +if (oldcurrent == slave)bond_change_active_slave (bond,NULL ); - }if (bond_is_lb (bond)) {/* Must be called only after the slave has been
@@ -1901,18 +1888,18 @@ int bond_release(struct net_device *bondif (list_empty (&bond->vlan_list)) { bond_dev->features |=NETIF_F_VLAN_CHALLENGED ; }else { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": %s: Warning: clearing HW address of %s while it " "still has VLANs.\n" , bond_dev->name, bond_dev->name); - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": %s: When re-adding slaves, make sure the bond's " "HW address matches its VLANs'.\n" , bond_dev->name); } }else if ((bond_dev->features &NETIF_F_VLAN_CHALLENGED ) && !bond_has_challenged_slaves (bond)) { - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: last VLAN challenged slave %s " "left bond %s. VLAN blocking is removed\n" , bond_dev->name, slave_dev->name, bond_dev->name);
@@ -1932,14 +1919,12 @@ int bond_release(struct net_device *bond*/ if (!USES_PRIMARY (bond->params.mode)) {/* unset promiscuity level from slave */ -if (bond_dev->flags &IFF_PROMISC ) { +if (bond_dev->flags &IFF_PROMISC )dev_set_promiscuity (slave_dev,-1 ); - }/* unset allmulti level from slave */ -if (bond_dev->flags &IFF_ALLMULTI ) { +if (bond_dev->flags &IFF_ALLMULTI )dev_set_allmulti (slave_dev,-1 ); - }/* flush master's mc_list from slave */ netif_addr_lock_bh (bond_dev);
@@ -1988,17 +1973,18 @@ static void bond_uninit(struct net_devic }/* -* First release a slave and than destroy the bond if no more slaves iare left. +* First release a slave and than destroy the bond if no more slaves are left. * Must be under rtnl_lock when this function is called. */ -int bond_release_and_destroy (struct net_device *bond_dev,struct net_device *slave_dev) +int bond_release_and_destroy (struct net_device *bond_dev, +struct net_device *slave_dev) {struct bonding *bond =netdev_priv (bond_dev);int ret; ret =bond_release (bond_dev, slave_dev);if ((ret ==0 ) && (bond->slave_cnt ==0 )) { - printk(KERN_INFO DRV_NAME ": %s: destroying bond %s.\n", +pr_info (DRV_NAME ": %s: destroying bond %s.\n" , bond_dev->name, bond_dev->name);unregister_netdevice (bond_dev); }
@@ -2019,9 +2005,8 @@ static int bond_release_all(struct net_dnetif_carrier_off (bond_dev); -if (bond->slave_cnt ==0 ) { +if (bond->slave_cnt ==0 ) goto out; - } bond->current_arp_slave =NULL ; bond->primary_slave =NULL ;
@@ -2031,9 +2016,8 @@ static int bond_release_all(struct net_d/* Inform AD package of unbinding of slave * before slave is detached from the list. */ -if (bond->params.mode ==BOND_MODE_8023AD ) { +if (bond->params.mode ==BOND_MODE_8023AD )bond_3ad_unbind_slave (slave); - } slave_dev = slave->dev;bond_detach_slave (bond, slave);
@@ -2062,14 +2046,12 @@ static int bond_release_all(struct net_d*/ if (!USES_PRIMARY (bond->params.mode)) {/* unset promiscuity level from slave */ -if (bond_dev->flags &IFF_PROMISC ) { +if (bond_dev->flags &IFF_PROMISC )dev_set_promiscuity (slave_dev,-1 ); - }/* unset allmulti level from slave */ -if (bond_dev->flags &IFF_ALLMULTI ) { +if (bond_dev->flags &IFF_ALLMULTI )dev_set_allmulti (slave_dev,-1 ); - }/* flush master's mc_list from slave */ netif_addr_lock_bh (bond_dev);
@@ -2104,20 +2086,20 @@ static int bond_release_all(struct net_d*/ memset (bond_dev->dev_addr,0 , bond_dev->addr_len); -if (list_empty (&bond->vlan_list)) { +if (list_empty (&bond->vlan_list)) bond_dev->features |=NETIF_F_VLAN_CHALLENGED ; - }else { - printk(KERN_WARNING DRV_NAME +else { +pr_warning (DRV_NAME ": %s: Warning: clearing HW address of %s while it " "still has VLANs.\n" , bond_dev->name, bond_dev->name); - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": %s: When re-adding slaves, make sure the bond's " "HW address matches its VLANs'.\n" , bond_dev->name); } - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: released all slaves\n" , bond_dev->name);
@@ -2135,8 +2117,8 @@ out:* - <slave_dev> is already active. * - The link state of <slave_dev> is not BOND_LINK_UP. * - <slave_dev> is not running. -* In these cases, this fuction does nothing. -* In the other cases, currnt_slave pointer is changed and 0 is returned. +* In these cases, this function does nothing. +* In the other cases, current_slave pointer is changed and 0 is returned. */ static int bond_ioctl_change_active (struct net_device *bond_dev,struct net_device *slave_dev) {
@@ -2145,15 +2127,12 @@ static int bond_ioctl_change_active(strustruct slave *new_active =NULL ;int res =0 ; -if (!USES_PRIMARY (bond->params.mode)) { +if (!USES_PRIMARY (bond->params.mode))return -EINVAL ; - }/* Verify that master_dev is indeed the master of slave_dev */ -if (!(slave_dev->flags &IFF_SLAVE ) || - (slave_dev->master != bond_dev)) { +if (!(slave_dev->flags &IFF_SLAVE ) || (slave_dev->master != bond_dev))return -EINVAL ; - }read_lock (&bond->lock);
@@ -2178,9 +2157,8 @@ static int bond_ioctl_change_active(struwrite_lock_bh (&bond->curr_slave_lock);bond_change_active_slave (bond, new_active);write_unlock_bh (&bond->curr_slave_lock); - }else { + }else res = -EINVAL ; - }read_unlock (&bond->lock);
@@ -2249,7 +2227,7 @@ static int bond_miimon_inspect(struct bo slave->link =BOND_LINK_FAIL ; slave->delay = bond->params.downdelay;if (slave->delay) { - printk(KERN_INFO DRV_NAME + pr_info(DRV_NAME ": %s: link status down for %s" "interface %s, disabling it in %d ms.\n", bond->dev->name,
@@ -2268,7 +2246,7 @@ static int bond_miimon_inspect(struct bo*/ slave->link =BOND_LINK_UP ; slave->jiffies = jiffies; - printk(KERN_INFO DRV_NAME + pr_info(DRV_NAME ": %s: link status up again after %d " "ms for interface %s.\n", bond->dev->name,
@@ -2295,7 +2273,7 @@ static int bond_miimon_inspect(struct bo slave->delay = bond->params.updelay;if (slave->delay) { - printk(KERN_INFO DRV_NAME + pr_info(DRV_NAME ": %s: link status up for " "interface %s, enabling it in %d ms.\n", bond->dev->name, slave->dev->name,
@@ -2307,7 +2285,7 @@ static int bond_miimon_inspect(struct bocase BOND_LINK_BACK :if (!link_state) { slave->link =BOND_LINK_DOWN ; - printk(KERN_INFO DRV_NAME + pr_info(DRV_NAME ": %s: link status down again after %d " "ms for interface %s.\n", bond->dev->name,
@@ -2361,7 +2339,7 @@ static void bond_miimon_commit(struct bo slave->state =BOND_STATE_BACKUP ; } - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: link status definitely " "up for interface %s.\n" , bond->dev->name, slave->dev->name);
@@ -2390,7 +2368,7 @@ static void bond_miimon_commit(struct bo bond->params.mode == BOND_MODE_8023AD)bond_set_slave_inactive_flags (slave); - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: link status definitely down for " "interface %s, disabling it\n" , bond->dev->name, slave->dev->name);
@@ -2409,7 +2387,7 @@ static void bond_miimon_commit(struct bocontinue ;default : - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": %s: invalid new link %d on slave %s\n" , bond->dev->name, slave->new_link, slave->dev->name);
@@ -2530,18 +2508,18 @@ static void bond_arp_send(struct net_devpr_debug ("arp %d on slave %s: dst %x src %x vid %d\n" , arp_op, slave_dev->name, dest_ip, src_ip, vlan_id); - + skb =arp_create (arp_op,ETH_P_ARP , dest_ip, slave_dev, src_ip,NULL , slave_dev->dev_addr,NULL );if (!skb) { - printk(KERN_ERR DRV_NAME ": ARP packet allocation failed\n"); +pr_err (DRV_NAME ": ARP packet allocation failed\n" );return ; }if (vlan_id) { skb =vlan_put_tag (skb, vlan_id);if (!skb) { - printk(KERN_ERR DRV_NAME ": failed to insert VLAN tag\n"); +pr_err (DRV_NAME ": failed to insert VLAN tag\n" );return ; } }
@@ -2581,7 +2559,7 @@ static void bond_arp_send_all(struct bon rv =ip_route_output_key (&init_net, &rt, &fl);if (rv) {if (net_ratelimit ()) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": %s: no route to arp_ip_target %pI4\n" , bond->dev->name, &fl.fl4_dst); }
@@ -2618,7 +2596,7 @@ static void bond_arp_send_all(struct bon }if (net_ratelimit ()) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": %s: no path to arp_ip_target %pI4 via rt.dev %s\n" , bond->dev->name, &fl.fl4_dst, rt->u.dst.dev ? rt->u.dst.dev->name :"NULL" );
@@ -2766,13 +2744,11 @@ void bond_loadbalance_arp_mon(struct wor delta_in_ticks =msecs_to_jiffies (bond->params.arp_interval); -if (bond->kill_timers) { +if (bond->kill_timers) goto out; - } -if (bond->slave_cnt ==0 ) { +if (bond->slave_cnt ==0 ) goto re_arm; - }read_lock (&bond->curr_slave_lock); oldcurrent = bond->curr_active_slave;
@@ -2800,14 +2776,14 @@ void bond_loadbalance_arp_mon(struct wor* is closed. */ if (!oldcurrent) { - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: link status definitely " "up for interface %s, " , bond->dev->name, slave->dev->name); do_failover =1 ; }else { - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: interface %s is now up\n" , bond->dev->name, slave->dev->name);
@@ -2826,18 +2802,16 @@ void bond_loadbalance_arp_mon(struct wor slave->link =BOND_LINK_DOWN ; slave->state =BOND_STATE_BACKUP ; -if (slave->link_failure_count <UINT_MAX ) { +if (slave->link_failure_count <UINT_MAX ) slave->link_failure_count++; - } - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: interface %s is now down.\n" , bond->dev->name, slave->dev->name); -if (slave == oldcurrent) { +if (slave == oldcurrent) do_failover =1 ; - } } }
@@ -2848,9 +2822,8 @@ void bond_loadbalance_arp_mon(struct wor* do - all replies will be rx'ed on same link causing slaves * to be unstable during low/no traffic periods */ -if (IS_UP (slave->dev)) { +if (IS_UP (slave->dev))bond_arp_send_all (bond, slave); - } }if (do_failover) {
@@ -2981,7 +2954,7 @@ static void bond_ab_arp_commit(struct bobond_change_active_slave (bond, slave); bond->current_arp_slave =NULL ; - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: %s is up and now the " "active interface\n" , bond->dev->name, slave->dev->name);
@@ -2997,7 +2970,7 @@ static void bond_ab_arp_commit(struct bobond_set_slave_inactive_flags (slave); bond->current_arp_slave =NULL ; - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: backup interface %s is now up\n" , bond->dev->name, slave->dev->name); }
@@ -3013,7 +2986,7 @@ static void bond_ab_arp_commit(struct bo slave->link =BOND_LINK_DOWN ;if (slave == bond->curr_active_slave) { - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: link status down for active " "interface %s, disabling it\n" , bond->dev->name, slave->dev->name);
@@ -3032,7 +3005,7 @@ static void bond_ab_arp_commit(struct bo bond->current_arp_slave =NULL ; }else if (slave->state ==BOND_STATE_BACKUP ) { - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: backup interface %s is now down\n" , bond->dev->name, slave->dev->name);
@@ -3041,7 +3014,7 @@ static void bond_ab_arp_commit(struct bobreak ;default : - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": %s: impossible: new_link %d on slave %s\n" , bond->dev->name, slave->new_link, slave->dev->name);
@@ -3075,7 +3048,7 @@ static void bond_ab_arp_probe(struct bonread_lock (&bond->curr_slave_lock);if (bond->current_arp_slave && bond->curr_active_slave) -printk ("PROBE: c_arp %s && cas %s BAD\n" , +pr_info (DRV_NAME "PROBE: c_arp %s && cas %s BAD\n" , bond->current_arp_slave->dev->name, bond->curr_active_slave->dev->name);
@@ -3125,7 +3098,7 @@ static void bond_ab_arp_probe(struct bonbond_set_slave_inactive_flags (slave); - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": %s: backup interface %s is now down.\n" , bond->dev->name, slave->dev->name); }
@@ -3175,9 +3148,8 @@ void bond_activebackup_arp_mon(struct wobond_ab_arp_probe (bond); re_arm: -if (bond->params.arp_interval) { +if (bond->params.arp_interval)queue_delayed_work (bond->wq, &bond->arp_work, delta_in_ticks); - } out:read_unlock (&bond->lock); }
@@ -3199,14 +3171,12 @@ static void *bond_info_seq_start(structread_lock (&dev_base_lock);read_lock (&bond->lock); -if (*pos ==0 ) { +if (*pos ==0 )return SEQ_START_TOKEN ; - }bond_for_each_slave (bond, slave, i) { -if (++off == *pos) { +if (++off == *pos)return slave; - } }return NULL ;
@@ -3218,9 +3188,8 @@ static void *bond_info_seq_next(struct sstruct slave *slave = v; ++*pos; -if (v ==SEQ_START_TOKEN ) { +if (v ==SEQ_START_TOKEN )return bond->first_slave; - } slave = slave->next;
@@ -3283,14 +3252,14 @@ static void bond_info_show_master(struct/* ARP information */ -if (bond->params.arp_interval >0 ) { -int printed=0 ; +if (bond->params.arp_interval >0 ) { +int printed =0 ;seq_printf (seq,"ARP Polling Interval (ms): %d\n" , bond->params.arp_interval);seq_printf (seq,"ARP IP target/s (n.n.n.n form):" ); -for (i =0 ; (i <BOND_MAX_ARP_TARGETS ) ;i++) { +for (i =0 ; (i <BOND_MAX_ARP_TARGETS ); i++) {if (!bond->params.arp_targets[i])break ;if (printed)
@@ -3330,7 +3299,8 @@ static void bond_info_show_master(struct } } -static void bond_info_show_slave (struct seq_file *seq,const struct slave *slave) +static void bond_info_show_slave (struct seq_file *seq, +const struct slave *slave) {struct bonding *bond = seq->private;
@@ -3346,12 +3316,11 @@ static void bond_info_show_slave(structconst struct aggregator *agg =SLAVE_AD_INFO (slave).port.aggregator; -if (agg) { +if (agg)seq_printf (seq,"Aggregator ID: %d\n" , agg->aggregator_identifier); - }else { +else seq_puts (seq,"Aggregator ID: N/A\n" ); - } } }
@@ -3360,9 +3329,8 @@ static int bond_info_seq_show(struct seqif (v ==SEQ_START_TOKEN ) {seq_printf (seq,"%s\n" , version);bond_info_show_master (seq); - }else { + }else bond_info_show_slave (seq, v); - }return 0 ; }
@@ -3407,13 +3375,12 @@ static int bond_create_proc_entry(struct bond->proc_entry =proc_create_data (bond_dev->name,S_IRUGO , bond_proc_dir, &bond_info_fops, bond); -if (bond->proc_entry ==NULL ) { - printk(KERN_WARNING DRV_NAME +if (bond->proc_entry ==NULL ) +pr_warning (DRV_NAME ": Warning: Cannot create /proc/net/%s/%s\n" ,DRV_NAME , bond_dev->name); - }else { +else memcpy (bond->proc_file_name, bond_dev->name,IFNAMSIZ ); - } }return 0 ;
@@ -3436,7 +3403,7 @@ static void bond_create_proc_dir(void)if (!bond_proc_dir) { bond_proc_dir =proc_mkdir (DRV_NAME , init_net.proc_net);if (!bond_proc_dir) - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: cannot create /proc/net/%s\n" ,DRV_NAME ); }
@@ -3484,13 +3451,14 @@ static int bond_event_changename(structbond_remove_proc_entry (bond);bond_create_proc_entry (bond); -bond_destroy_sysfs_entry (bond); -bond_create_sysfs_entry (bond); +bond_destroy_sysfs_entry (bond); +bond_create_sysfs_entry (bond);return NOTIFY_DONE ; } -static int bond_master_netdev_event (unsigned long event,struct net_device *bond_dev) +static int bond_master_netdev_event (unsigned long event, +struct net_device *bond_dev) {struct bonding *event_bond =netdev_priv (bond_dev);
@@ -3507,7 +3475,8 @@ static int bond_master_netdev_event(unsireturn NOTIFY_DONE ; } -static int bond_slave_netdev_event (unsigned long event,struct net_device *slave_dev) +static int bond_slave_netdev_event (unsigned long event, +struct net_device *slave_dev) {struct net_device *bond_dev = slave_dev->master;struct bonding *bond =netdev_priv (bond_dev);
@@ -3585,7 +3554,8 @@ static int bond_slave_netdev_event(unsig* locks for us to safely manipulate the slave devices (RTNL lock, * dev_probe_lock). */ -static int bond_netdev_event (struct notifier_block *this,unsigned long event,void *ptr) +static int bond_netdev_event (struct notifier_block *this, +unsigned long event,void *ptr) {struct net_device *event_dev = (struct net_device *)ptr;
@@ -3940,9 +3910,9 @@ static int bond_do_ioctl(struct net_deviswitch (cmd) {case SIOCGMIIPHY : mii =if_mii (ifr); -if (!mii) { +if (!mii)return -EINVAL ; - } + mii->phy_id =0 ;/* Fall Through */ case SIOCGMIIREG :
@@ -3951,18 +3921,18 @@ static int bond_do_ioctl(struct net_devi* instead of SIOCGMIIPHY. */ mii =if_mii (ifr); -if (!mii) { +if (!mii)return -EINVAL ; - } +if (mii->reg_num ==1 ) {struct bonding *bond =netdev_priv (bond_dev); mii->val_out =0 ;read_lock (&bond->lock);read_lock (&bond->curr_slave_lock); -if (netif_carrier_ok (bond->dev)) { +if (netif_carrier_ok (bond->dev)) mii->val_out =BMSR_LSTATUS ; - } +read_unlock (&bond->curr_slave_lock);read_unlock (&bond->lock); }
@@ -3972,32 +3942,26 @@ static int bond_do_ioctl(struct net_devicase SIOCBONDINFOQUERY : u_binfo = (struct ifbond __user *)ifr->ifr_data; -if (copy_from_user (&k_binfo, u_binfo,sizeof (ifbond))) { +if (copy_from_user (&k_binfo, u_binfo,sizeof (ifbond)))return -EFAULT ; - } res =bond_info_query (bond_dev, &k_binfo); -if (res ==0 ) { -if (copy_to_user (u_binfo, &k_binfo,sizeof (ifbond))) { -return -EFAULT ; - } - } +if (res ==0 && +copy_to_user (u_binfo, &k_binfo,sizeof (ifbond))) +return -EFAULT ;return res;case BOND_SLAVE_INFO_QUERY_OLD :case SIOCBONDSLAVEINFOQUERY : u_sinfo = (struct ifslave __user *)ifr->ifr_data; -if (copy_from_user (&k_sinfo, u_sinfo,sizeof (ifslave))) { +if (copy_from_user (&k_sinfo, u_sinfo,sizeof (ifslave)))return -EFAULT ; - } res =bond_slave_info_query (bond_dev, &k_sinfo); -if (res ==0 ) { -if (copy_to_user (u_sinfo, &k_sinfo,sizeof (ifslave))) { -return -EFAULT ; - } - } +if (res ==0 && +copy_to_user (u_sinfo, &k_sinfo,sizeof (ifslave))) +return -EFAULT ;return res;default :
@@ -4005,17 +3969,16 @@ static int bond_do_ioctl(struct net_devibreak ; } -if (!capable (CAP_NET_ADMIN )) { +if (!capable (CAP_NET_ADMIN ))return -EPERM ; - } slave_dev =dev_get_by_name (&init_net, ifr->ifr_slave);pr_debug ("slave_dev=%p: \n" , slave_dev); -if (!slave_dev) { +if (!slave_dev) res = -ENODEV ; - }else { +else {pr_debug ("slave_dev->name=%s: \n" , slave_dev->name);switch (cmd) {case BOND_ENSLAVE_OLD :
@@ -4052,30 +4015,30 @@ static void bond_set_multicast_list(stru/* * Do promisc before checking multicast_mode */ -if ((bond_dev->flags &IFF_PROMISC ) && !(bond->flags &IFF_PROMISC )) { +if ((bond_dev->flags &IFF_PROMISC ) && !(bond->flags &IFF_PROMISC ))/* * FIXME: Need to handle the error when one of the multi-slaves * encounters error. */ bond_set_promiscuity (bond,1 ); - } -if (!(bond_dev->flags &IFF_PROMISC ) && (bond->flags &IFF_PROMISC )) { + +if (!(bond_dev->flags &IFF_PROMISC ) && (bond->flags &IFF_PROMISC ))bond_set_promiscuity (bond,-1 ); - } +/* set allmulti flag to slaves */ -if ((bond_dev->flags &IFF_ALLMULTI ) && !(bond->flags &IFF_ALLMULTI )) { +if ((bond_dev->flags &IFF_ALLMULTI ) && !(bond->flags &IFF_ALLMULTI ))/* * FIXME: Need to handle the error when one of the multi-slaves * encounters error. */ bond_set_allmulti (bond,1 ); - } -if (!(bond_dev->flags &IFF_ALLMULTI ) && (bond->flags &IFF_ALLMULTI )) { + +if (!(bond_dev->flags &IFF_ALLMULTI ) && (bond->flags &IFF_ALLMULTI ))bond_set_allmulti (bond,-1 ); - } +read_lock (&bond->lock);
@@ -4083,16 +4046,14 @@ static void bond_set_multicast_list(stru/* looking for addresses to add to slaves' mc list */ for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next) { -if (!bond_mc_list_find_dmi (dmi, bond->mc_list)) { +if (!bond_mc_list_find_dmi (dmi, bond->mc_list))bond_mc_add (bond, dmi->dmi_addr, dmi->dmi_addrlen); - } }/* looking for addresses to delete from slaves' list */ for (dmi = bond->mc_list; dmi; dmi = dmi->next) { -if (!bond_mc_list_find_dmi (dmi, bond_dev->mc_list)) { +if (!bond_mc_list_find_dmi (dmi, bond_dev->mc_list))bond_mc_delete (bond, dmi->dmi_addr, dmi->dmi_addrlen); - } }/* save master's multicast list */
@@ -4212,9 +4173,8 @@ static int bond_set_mac_address(struct nif (bond->params.fail_over_mac ==BOND_FOM_ACTIVE )return 0 ; -if (!is_valid_ether_addr (sa->sa_data)) { +if (!is_valid_ether_addr (sa->sa_data))return -EADDRNOTAVAIL ; - }/* Can't hold bond->lock with bh disabled here since * some base drivers panic. On the other hand we can't
@@ -4285,9 +4245,8 @@ static int bond_xmit_roundrobin(struct sread_lock (&bond->lock); -if (!BOND_IS_OK (bond)) { +if (!BOND_IS_OK (bond)) goto out; - }/* * Concurrent TX may collide on rr_tx_counter; we accept that
@@ -4297,9 +4256,8 @@ static int bond_xmit_roundrobin(struct sbond_for_each_slave (bond, slave, i) { slave_no--; -if (slave_no <0 ) { +if (slave_no <0 )break ; - } } start_at = slave;
@@ -4334,9 +4292,8 @@ static int bond_xmit_activebackup(structread_lock (&bond->lock);read_lock (&bond->curr_slave_lock); -if (!BOND_IS_OK (bond)) { +if (!BOND_IS_OK (bond)) goto out; - }if (!bond->curr_active_slave) goto out;
@@ -4344,10 +4301,10 @@ static int bond_xmit_activebackup(struct res =bond_dev_queue_xmit (bond, skb, bond->curr_active_slave->dev); out: -if (res) { +if (res)/* no suitable interface, frame not sent */ dev_kfree_skb (skb); - } +read_unlock (&bond->curr_slave_lock);read_unlock (&bond->lock);return 0 ;
@@ -4368,17 +4325,15 @@ static int bond_xmit_xor(struct sk_buffread_lock (&bond->lock); -if (!BOND_IS_OK (bond)) { +if (!BOND_IS_OK (bond)) goto out; - } slave_no = bond->xmit_hash_policy (skb, bond_dev, bond->slave_cnt);bond_for_each_slave (bond, slave, i) { slave_no--; -if (slave_no <0 ) { +if (slave_no <0 )break ; - } } start_at = slave;
@@ -4414,17 +4369,15 @@ static int bond_xmit_broadcast(struct skread_lock (&bond->lock); -if (!BOND_IS_OK (bond)) { +if (!BOND_IS_OK (bond)) goto out; - }read_lock (&bond->curr_slave_lock); start_at = bond->curr_active_slave;read_unlock (&bond->curr_slave_lock); -if (!start_at) { +if (!start_at) goto out; - }bond_for_each_slave_from (bond, slave, i, start_at) { if (IS_UP(slave->dev) &&
@@ -4433,7 +4386,7 @@ static int bond_xmit_broadcast(struct skif (tx_dev) {struct sk_buff *skb2 =skb_clone (skb,GFP_ATOMIC );if (!skb2) { - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": %s: Error: bond_xmit_broadcast(): " "skb_clone() failed\n" , bond_dev->name);
@@ -4450,15 +4403,14 @@ static int bond_xmit_broadcast(struct sk } } -if (tx_dev) { +if (tx_dev) res =bond_dev_queue_xmit (bond, skb, tx_dev); - } out: -if (res) { +if (res)/* no suitable interface, frame not sent */ dev_kfree_skb (skb); - } +/* frame sent to all suitable interfaces */ read_unlock (&bond->lock);return 0 ;
@@ -4502,7 +4454,7 @@ static int bond_start_xmit(struct sk_bufreturn bond_alb_xmit (skb, dev);default :/* Should never happen, mode already checked */ - printk(KERN_ERR DRV_NAME ": %s: Error: Unknown bonding mode %d\n", +pr_err (DRV_NAME ": %s: Error: Unknown bonding mode %d\n" , dev->name, bond->params.mode);WARN_ON_ONCE (1 );dev_kfree_skb (skb);
@@ -4539,7 +4491,7 @@ void bond_set_mode_ops(struct bonding *bbreak ;default :/* Should never happen, mode already checked */ - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": %s: Error: Unknown bonding mode %d\n" , bond_dev->name, mode);
@@ -4752,7 +4704,7 @@ static int bond_check_params(struct bondif (mode) { bond_mode =bond_parse_parm (mode, bond_mode_tbl);if (bond_mode ==-1 ) { - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": Error: Invalid bonding mode \"%s\"\n" , mode ==NULL ?"NULL" : mode);return -EINVAL ;
@@ -4762,16 +4714,16 @@ static int bond_check_params(struct bondif (xmit_hash_policy) {if ((bond_mode !=BOND_MODE_XOR ) && (bond_mode !=BOND_MODE_8023AD )) { - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": xor_mode param is irrelevant in mode %s\n" ,bond_mode_name (bond_mode)); }else { xmit_hashtype =bond_parse_parm (xmit_hash_policy, xmit_hashtype_tbl);if (xmit_hashtype ==-1 ) { - printk(KERN_ERR DRV_NAME -": Error: Invalid xmit_hash_policy \"%s\"\n" , - xmit_hash_policy ==NULL ?"NULL" : +pr_err (DRV_NAME +": Error: Invalid xmit_hash_policy \"%s\"\n" , + xmit_hash_policy ==NULL ?"NULL" : xmit_hash_policy);return -EINVAL ; }
@@ -4780,13 +4732,13 @@ static int bond_check_params(struct bondif (lacp_rate) {if (bond_mode !=BOND_MODE_8023AD ) { - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": lacp_rate param is irrelevant in mode %s\n" ,bond_mode_name (bond_mode)); }else { lacp_fast =bond_parse_parm (lacp_rate, bond_lacp_tbl);if (lacp_fast ==-1 ) { - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": Error: Invalid lacp rate \"%s\"\n" , lacp_rate ==NULL ?"NULL" : lacp_rate);return -EINVAL ;
@@ -4797,14 +4749,14 @@ static int bond_check_params(struct bondif (ad_select) { params->ad_select =bond_parse_parm (ad_select, ad_select_tbl);if (params->ad_select ==-1 ) { - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": Error: Invalid ad_select \"%s\"\n" , ad_select ==NULL ?"NULL" : ad_select);return -EINVAL ; }if (bond_mode !=BOND_MODE_8023AD ) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": ad_select param only affects 802.3ad mode\n" ); } }else {
@@ -4812,7 +4764,7 @@ static int bond_check_params(struct bond }if (max_bonds <0 || max_bonds >INT_MAX ) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: max_bonds (%d) not in range %d-%d, so it " "was reset to BOND_DEFAULT_MAX_BONDS (%d)\n" , max_bonds,0 ,INT_MAX ,BOND_DEFAULT_MAX_BONDS );
@@ -4820,7 +4772,7 @@ static int bond_check_params(struct bond }if (miimon <0 ) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: miimon module parameter (%d), " "not in range 0-%d, so it was reset to %d\n" , miimon,INT_MAX ,BOND_LINK_MON_INTERV );
@@ -4828,7 +4780,7 @@ static int bond_check_params(struct bond }if (updelay <0 ) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: updelay module parameter (%d), " "not in range 0-%d, so it was reset to 0\n" , updelay,INT_MAX );
@@ -4836,7 +4788,7 @@ static int bond_check_params(struct bond }if (downdelay <0 ) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: downdelay module parameter (%d), " "not in range 0-%d, so it was reset to 0\n" , downdelay,INT_MAX );
@@ -4844,7 +4796,7 @@ static int bond_check_params(struct bond }if ((use_carrier !=0 ) && (use_carrier !=1 )) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: use_carrier module parameter (%d), " "not of valid value (0/1), so it was set to 1\n" , use_carrier);
@@ -4852,14 +4804,14 @@ static int bond_check_params(struct bond }if (num_grat_arp <0 || num_grat_arp >255 ) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: num_grat_arp (%d) not in range 0-255 so it " "was reset to 1 \n" , num_grat_arp); num_grat_arp =1 ; }if (num_unsol_na <0 || num_unsol_na >255 ) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: num_unsol_na (%d) not in range 0-255 so it " "was reset to 1 \n" , num_unsol_na); num_unsol_na =1 ;
@@ -4868,12 +4820,12 @@ static int bond_check_params(struct bond/* reset values for 802.3ad */ if (bond_mode ==BOND_MODE_8023AD ) {if (!miimon) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: miimon must be specified, " "otherwise bonding will not detect link " "failure, speed and duplex which are " "essential for 802.3ad operation\n" ); -printk (KERN_WARNING "Forcing miimon to 100msec\n" ); +pr_warning ("Forcing miimon to 100msec\n" ); miimon =100 ; } }
@@ -4882,12 +4834,12 @@ static int bond_check_params(struct bondif ((bond_mode ==BOND_MODE_TLB ) || (bond_mode ==BOND_MODE_ALB )) {if (!miimon) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: miimon must be specified, " "otherwise bonding will not detect link " "failure and link speed which are essential " "for TLB/ALB load balancing\n" ); -printk (KERN_WARNING "Forcing miimon to 100msec\n" ); +pr_warning ("Forcing miimon to 100msec\n" ); miimon =100 ; } }
@@ -4907,7 +4859,7 @@ static int bond_check_params(struct bond/* just warn the user the up/down delay will have * no effect since miimon is zero... */ - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: miimon module parameter not set " "and updelay (%d) or downdelay (%d) module " "parameter is set; updelay and downdelay have "
@@ -4917,7 +4869,7 @@ static int bond_check_params(struct bond }else {/* don't allow arp monitoring */ if (arp_interval) { - printk(KERN_WARNING DRV_NAME + pr_warning(DRV_NAME ": Warning: miimon (%d) and arp_interval (%d) " "can't be used simultaneously, disabling ARP " "monitoring\n",
@@ -4926,7 +4878,7 @@ static int bond_check_params(struct bond }if ((updelay % miimon) !=0 ) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: updelay (%d) is not a multiple " "of miimon (%d), updelay rounded to %d ms\n" , updelay, miimon, (updelay / miimon) * miimon);
@@ -4935,7 +4887,7 @@ static int bond_check_params(struct bond updelay /= miimon;if ((downdelay % miimon) !=0 ) { - printk(KERN_WARNING DRV_NAME + pr_warning(DRV_NAME ": Warning: downdelay (%d) is not a multiple " "of miimon (%d), downdelay rounded to %d ms\n", downdelay, miimon,
@@ -4946,7 +4898,7 @@ static int bond_check_params(struct bond }if (arp_interval <0 ) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: arp_interval module parameter (%d) " ", not in range 0-%d, so it was reset to %d\n" , arp_interval,INT_MAX ,BOND_LINK_ARP_INTERV );
@@ -4959,7 +4911,7 @@ static int bond_check_params(struct bond/* not complete check, but should be good enough to catch mistakes */ if (!isdigit (arp_ip_target[arp_ip_count][0 ])) { - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: bad arp_ip_target module parameter " "(%s), ARP monitoring will not be performed\n" , arp_ip_target[arp_ip_count]);
@@ -4972,7 +4924,7 @@ static int bond_check_params(struct bondif (arp_interval && !arp_ip_count) {/* don't allow arping if no arp_ip_target given... */ - printk(KERN_WARNING DRV_NAME + pr_warning(DRV_NAME ": Warning: arp_interval module parameter (%d) " "specified without providing an arp_ip_target " "parameter, arp_interval was reset to 0\n",
@@ -4982,12 +4934,12 @@ static int bond_check_params(struct bondif (arp_validate) {if (bond_mode !=BOND_MODE_ACTIVEBACKUP ) { - printk(KERN_ERR DRV_NAME - ": arp_validate only supported in active-backup mode\n"); +pr_err (DRV_NAME +": arp_validate only supported in active-backup mode\n" );return -EINVAL ; }if (!arp_interval) { - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": arp_validate requires arp_interval\n" );return -EINVAL ; }
@@ -4995,7 +4947,7 @@ static int bond_check_params(struct bond arp_validate_value =bond_parse_parm (arp_validate, arp_validate_tbl);if (arp_validate_value ==-1 ) { - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": Error: invalid arp_validate \"%s\"\n" , arp_validate ==NULL ?"NULL" : arp_validate);return -EINVAL ;
@@ -5004,20 +4956,20 @@ static int bond_check_params(struct bond arp_validate_value =0 ;if (miimon) { - printk(KERN_INFO DRV_NAME +pr_info (DRV_NAME ": MII link monitoring set to %d ms\n" , miimon); }else if (arp_interval) {int i; - printk(KERN_INFO DRV_NAME -": ARP monitoring set to %d ms, validate %s, with %d target(s):" , +pr_info (DRV_NAME ": ARP monitoring set to %d ms," +" validate %s, with %d target(s):" , arp_interval, arp_validate_tbl[arp_validate_value].modename, arp_ip_count);for (i =0 ; i < arp_ip_count; i++) -printk (" %s" , arp_ip_target[i]); +printk (" %s" , arp_ip_target[i]);printk ("\n" );
@@ -5025,7 +4977,7 @@ static int bond_check_params(struct bond/* miimon and arp_interval not set, we need one so things * work as expected, see bonding.txt for details */ - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: either miimon or arp_interval and " "arp_ip_target module parameters must be specified, " "otherwise bonding will not detect link failures! see "
@@ -5036,7 +4988,7 @@ static int bond_check_params(struct bond/* currently, using a primary only makes sense * in active backup, TLB or ALB modes */ - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: %s primary device specified but has no " "effect in %s mode\n" , primary,bond_mode_name (bond_mode));
@@ -5047,14 +4999,14 @@ static int bond_check_params(struct bond fail_over_mac_value =bond_parse_parm (fail_over_mac, fail_over_mac_tbl);if (fail_over_mac_value ==-1 ) { - printk(KERN_ERR DRV_NAME +pr_err (DRV_NAME ": Error: invalid fail_over_mac \"%s\"\n" , arp_validate ==NULL ?"NULL" : arp_validate);return -EINVAL ; }if (bond_mode !=BOND_MODE_ACTIVEBACKUP ) - printk(KERN_WARNING DRV_NAME +pr_warning (DRV_NAME ": Warning: fail_over_mac only affects " "active-backup mode.\n" ); }else {
@@ -5120,9 +5072,8 @@ int bond_create(const char *name)if (name) {list_for_each_entry (bond, &bond_dev_list, bond_list)if (strnicmp (bond->dev->name, name,IFNAMSIZ ) ==0 ) { - printk(KERN_ERR DRV_NAME -": cannot add bond %s; it already exists\n" , - name); +pr_err (DRV_NAME ": cannot add bond %s;" +" it already exists\n" , name); res = -EPERM ; goto out_rtnl; }
@@ -5131,8 +5082,7 @@ int bond_create(const char *name) bond_dev =alloc_netdev (sizeof (struct bonding ), name ? name :"" , ether_setup);if (!bond_dev) { - printk(KERN_ERR DRV_NAME -": %s: eek! can't alloc netdev!\n" , +pr_err (DRV_NAME ": %s: eek! can't alloc netdev!\n" , name); res = -ENOMEM ; goto out_rtnl;
@@ -5151,18 +5101,16 @@ int bond_create(const char *name)*/ res =bond_init (bond_dev); -if (res <0 ) { +if (res <0 ) goto out_netdev; - }bond_set_lockdep_class (bond_dev);netif_carrier_off (bond_dev); res =register_netdevice (bond_dev); -if (res <0 ) { +if (res <0 ) goto out_bond; - } res =bond_create_sysfs_entry (netdev_priv (bond_dev));if (res <0 )
@@ -5187,12 +5135,11 @@ static int __init bonding_init(void)int i;int res; -printk (KERN_INFO "%s" , version); +pr_info ("%s" , version); res =bond_check_params (&bonding_defaults); -if (res) { +if (res) goto out; - }bond_create_proc_dir ();
@@ -5239,13 +5186,3 @@ MODULE_LICENSE("GPL");MODULE_VERSION (DRV_VERSION );MODULE_DESCRIPTION (DRV_DESCRIPTION ", v" DRV_VERSION );MODULE_AUTHOR ("Thomas Davis, [email protected] and many others" ); -MODULE_SUPPORTED_DEVICE ("most ethernet devices" ); - -/* -* Local variables: -* c-indent-level: 8 -* c-basic-offset: 8 -* tab-width: 8 -* End: -*/ -
drivers/net/bonding/bond_sysfs.c +175 -149
939 lines not on this page · raw message
PATCH 6/9 bonding: elminate bad refcount code
In reply to Stephen HemmingerThe "expected_refcount" stuff in bonding sysfs module is a mistake. Sysfs does proper refcounting, and it is okay to remove a bond device that has some user process holding the file open.
drivers/net/bonding/bond_sysfs.c +0 -21
@@ -40,12 +40,6 @@#define to_dev (obj) container_of(obj, struct device, kobj)#define to_bond (cd) ((struct bonding *)(netdev_priv(to_net_dev(cd)))) -/*---------------------------- Declarations -------------------------------*/ - -static int expected_refcount =-1 ; - -/*------------------------------ Functions --------------------------------*/ -/* * "show" function for the bond_masters attribute. * The class parameter is ignored.
@@ -112,18 +106,6 @@ static ssize_t bonding_store_bonds(struclist_for_each_entry (bond, &bond_dev_list, bond_list)if (strnicmp (bond->dev->name, ifname,IFNAMSIZ ) ==0 ) { -/* check the ref count on the bond's kobject. -* If it's > expected, then there's a file open, -* and we have to fail. -*/ -if (atomic_read (&bond->dev->dev.kobj.kref.refcount) - > expected_refcount){ -pr_info (DRV_NAME -": Unable remove bond %s due to open references.\n" , - ifname); - res = -EPERM ; - goto out_unlock; - }pr_info (DRV_NAME ": %s is being deleted...\n" , bond->dev->name);
@@ -1579,9 +1561,6 @@ int bond_create_sysfs_entry(struct bondiif (err)printk (KERN_EMERG "eek! didn't create group!\n" ); -if (expected_refcount <1 ) - expected_refcount =atomic_read (&bond->dev->dev.kobj.kref.refcount); -return err; }/*
PATCH 7/9 bonding: network device names are case sensative
In reply to Stephen HemmingerThe bonding device acts unlike all other Linux network device functions in that it ignores case of device names. The developer must have come from windows!
Cleanup the management of names and use standard routines where possible. Flag places where bonding device still doesn't work right with network namespaces.
drivers/net/bonding/bond_main.c +6 -9
@@ -5064,19 +5064,16 @@ static void bond_set_lockdep_class(strucint bond_create (const char *name) {struct net_device *bond_dev; -struct bonding *bond;int res;rtnl_lock ();/* Check to see if the bond already exists. */ -if (name) { -list_for_each_entry (bond, &bond_dev_list, bond_list) -if (strnicmp (bond->dev->name, name,IFNAMSIZ ) ==0 ) { -pr_err (DRV_NAME ": cannot add bond %s;" -" it already exists\n" , name); - res = -EPERM ; - goto out_rtnl; - } +/* FIXME: pass netns from caller */ +if (name &&__dev_get_by_name (&init_net, name)) { +pr_err (DRV_NAME ": cannot add bond %s; already exists\n" , + name); + res = -EEXIST ; + goto out_rtnl; } bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",
drivers/net/bonding/bond_sysfs.c +51 -44
140 lines not on this page · raw message
PATCH 8/9 bonding: use is_zero_ether_addr
In reply to Stephen HemmingerRemove bogus non-portable possibly unaligned way of testing for zero addres..
drivers/net/bonding/bond_sysfs.c +2 -2
@@ -33,6 +33,7 @@#include <linux/ctype.h> #include <linux/inet.h> #include <linux/rtnetlink.h> +#include <linux/etherdevice.h> #include <net/net_namespace.h> #include "bonding.h"
@@ -275,10 +276,9 @@ static ssize_t bonding_store_slaves(stru/* If this is the first slave, then we need to set the master's hardware address to be the same as the slave's. */ -if (!(*((u32 *) & (bond->dev->dev_addr[0 ])))) { +if (is_zero_ether_addr (bond->dev->dev_addr))memcpy (bond->dev->dev_addr, dev->dev_addr, dev->addr_len); - }/* Set the slave's MTU to match the bond */ original_mtu = dev->mtu;
PATCH 9/9 bonding: initialization rework
In reply to Stephen HemmingerNeed to rework how bonding devices are initialized to make it more amenable to creating bonding devices via netlink.
--- drivers/net/bonding/bond_main.c | 67 +++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 37 deletions(-)
drivers/net/bonding/bond_main.c +30 -37
@@ -210,6 +210,7 @@ struct bond_parm_tbl ad_select_tbl[] = {/*-------------------------- Forward declarations ---------------------------*/ static void bond_send_gratuitous_arp (struct bonding *bond); +static int bond_init (struct net_device *bond_dev);static void bond_deinit (struct net_device *bond_dev);/*---------------------------- General routines -----------------------------*/
@@ -4518,6 +4519,7 @@ static const struct ethtool_ops bond_eth };static const struct net_device_ops bond_netdev_ops = { + .ndo_init = bond_init, .ndo_uninit = bond_uninit, .ndo_open = bond_open, .ndo_stop = bond_close,
@@ -4533,38 +4535,22 @@ static const struct net_device_ops bond_ .ndo_vlan_rx_kill_vid = bond_vlan_rx_kill_vid, }; -/* -* Does not allocate but creates a /proc entry. -* Allowed to fail. -*/ -static int bond_init (struct net_device *bond_dev) +static void bond_setup (struct net_device *bond_dev) {struct bonding *bond =netdev_priv (bond_dev); -pr_debug ("Begin bond_init for %s\n" , bond_dev->name); -/* initialize rwlocks */ rwlock_init (&bond->lock);rwlock_init (&bond->curr_slave_lock); bond->params = bonding_defaults; - bond->wq =create_singlethread_workqueue (bond_dev->name); -if (!bond->wq) -return -ENOMEM ; -/* Initialize pointers */ - bond->first_slave =NULL ; - bond->curr_active_slave =NULL ; - bond->current_arp_slave =NULL ; - bond->primary_slave =NULL ; bond->dev = bond_dev; - bond->send_grat_arp =0 ; - bond->send_unsol_na =0 ; - bond->setup_by_slave =0 ;INIT_LIST_HEAD (&bond->vlan_list);/* Initialize the device entry points */ +ether_setup (bond_dev); bond_dev->netdev_ops = &bond_netdev_ops; bond_dev->ethtool_ops = &bond_ethtool_ops;bond_set_mode_ops (bond, bond->params.mode);
@@ -4575,6 +4561,8 @@ static int bond_init(struct net_device * bond_dev->tx_queue_len =0 ; bond_dev->flags |=IFF_MASTER |IFF_MULTICAST ; bond_dev->priv_flags |=IFF_BONDING ; + bond_dev->priv_flags &= ~IFF_XMIT_DST_RELEASE ; +if (bond->params.arp_interval) bond_dev->priv_flags |=IFF_MASTER_ARPMON ;
@@ -4599,10 +4587,6 @@ static int bond_init(struct net_device *NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER); -bond_create_proc_entry (bond); -list_add_tail (&bond->bond_list, &bond_dev_list); - -return 0 ; }static void bond_work_cancel_all (struct bonding *bond)
@@ -5056,6 +5040,29 @@ static void bond_set_lockdep_class(strucnetdev_for_each_tx_queue (dev, bond_set_lockdep_class_one,NULL ); } +/* +* Called from registration process +*/ +static int bond_init (struct net_device *bond_dev) +{ +struct bonding *bond =netdev_priv (bond_dev); + +pr_debug ("Begin bond_init for %s\n" , bond_dev->name); + + bond->wq =create_singlethread_workqueue (bond_dev->name); +if (!bond->wq) +return -ENOMEM ; + +bond_set_lockdep_class (bond_dev); + +netif_carrier_off (bond_dev); + +bond_create_proc_entry (bond); +list_add_tail (&bond->bond_list, &bond_dev_list); + +return 0 ; +} +/* Create a new bond based on the specified name and bonding parameters. * If name is NULL, obtain a suitable "bond%d" name for us. * Caller must NOT hold rtnl_lock; we need to release it here before we
@@ -5077,7 +5084,7 @@ int bond_create(const char *name) } bond_dev =alloc_netdev (sizeof (struct bonding ), name ? name :"" , - ether_setup); + bond_setup);if (!bond_dev) {pr_err (DRV_NAME ": %s: eek! can't alloc netdev!\n" , name);
@@ -5085,26 +5092,12 @@ int bond_create(const char *name) goto out_rtnl; } - bond_dev->priv_flags &= ~IFF_XMIT_DST_RELEASE ;if (!name) { res =dev_alloc_name (bond_dev,"bond%d" );if (res <0 ) goto out_netdev; } -/* bond_init() must be called after dev_alloc_name() (for the -* /proc files), but before register_netdevice(), because we -* need to set function pointers. -*/ - - res =bond_init (bond_dev); -if (res <0 ) - goto out_netdev; - -bond_set_lockdep_class (bond_dev); - -netif_carrier_off (bond_dev); - res =register_netdevice (bond_dev);if (res <0 ) goto out_bond;
David Miller
maintainerFrom: Stephen Hemminger <[email protected]>
Date: Fri, 12 Jun 2009 22:02:43 -0700
Quoted 2 lines
I started implementing a netlink interface to bonding, and quickly saw lots of things that need to be cleaned up first.
All applied to net-next-2.6, thanks!