Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fee991a authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller
Browse files

bonding: remove slave lists 



And all the initialization.

CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: default avatarVeaceslav Falico <vfalico@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 344f3297

drivers/net/bonding/bond_main.c

+0 −4
Original line number Diff line number Diff line
@@ -972,7 +972,6 @@ void bond_select_active_slave(struct bonding *bond) 
 */

static void bond_attach_slave(struct bonding *bond, struct slave *new_slave)

{

	list_add_tail_rcu(&new_slave->list, &bond->slave_list);

	bond->slave_cnt++;

}
@@ -988,7 +987,6 @@ static void bond_attach_slave(struct bonding *bond, struct slave *new_slave) 
 */

static void bond_detach_slave(struct bonding *bond, struct slave *slave)

{

	list_del_rcu(&slave->list);

	bond->slave_cnt--;

}
@@ -1374,7 +1372,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
		res = -ENOMEM;

		goto err_undo_flags;

	}

	INIT_LIST_HEAD(&new_slave->list);

	/*

	 * Set the new_slave's queue_id to be zero.  Queue ID mapping

	 * is set via sysfs or module option if desired.
@@ -4022,7 +4019,6 @@ static void bond_setup(struct net_device *bond_dev) 
	/* initialize rwlocks */

	rwlock_init(&bond->lock);

	rwlock_init(&bond->curr_slave_lock);

	INIT_LIST_HEAD(&bond->slave_list);

	bond->params = bonding_defaults;



	/* Initialize pointers */

drivers/net/bonding/bonding.h

+0 −2
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ struct bond_parm_tbl { 


struct slave {

	struct net_device *dev; /* first - useful for panic debug */

	struct list_head list;

	struct bonding *bond; /* our master */

	int    delay;

	unsigned long jiffies;
@@ -205,7 +204,6 @@ struct slave { 
 */

struct bonding {

	struct   net_device *dev; /* first - useful for panic debug */

	struct   list_head slave_list;

	struct   slave *curr_active_slave;

	struct   slave *current_arp_slave;

	struct   slave *primary_slave;