Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-01-01 07:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

bonding: remove slave lists

Browse Source 
And all the initialization.

CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Veaceslav Falico 2013-09-25 09:20:28 +02:00 committed by David S. Miller
parent 344f329762
commit 4fee991a46
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/bonding/bond_main.c
View File

@ -972,7 +972,6 @@ void bond_select_active_slave(struct bonding *bond)
*/ */
static void bond_attach_slave(struct bonding *bond, struct slave *new_slave) 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++; 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) static void bond_detach_slave(struct bonding *bond, struct slave *slave)
{ {
list_del_rcu(&slave->list);
bond->slave_cnt--; bond->slave_cnt--;
} }
@ -1374,7 +1372,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
res = -ENOMEM; res = -ENOMEM;
goto err_undo_flags; goto err_undo_flags;
} }
INIT_LIST_HEAD(&new_slave->list);
/* /*
* Set the new_slave's queue_id to be zero. Queue ID mapping * Set the new_slave's queue_id to be zero. Queue ID mapping
* is set via sysfs or module option if desired. * is set via sysfs or module option if desired.
@ -4022,7 +4019,6 @@ static void bond_setup(struct net_device *bond_dev)
/* initialize rwlocks */ /* initialize rwlocks */
rwlock_init(&bond->lock); rwlock_init(&bond->lock);
rwlock_init(&bond->curr_slave_lock); rwlock_init(&bond->curr_slave_lock);
INIT_LIST_HEAD(&bond->slave_list);
bond->params = bonding_defaults; bond->params = bonding_defaults;
/* Initialize pointers */ /* Initialize pointers */

2
drivers/net/bonding/bonding.h
View File

@ -165,7 +165,6 @@ struct bond_parm_tbl {
struct slave { struct slave {
struct net_device *dev; /* first - useful for panic debug */ struct net_device *dev; /* first - useful for panic debug */
struct list_head list;
struct bonding *bond; /* our master */ struct bonding *bond; /* our master */
int delay; int delay;
unsigned long jiffies; unsigned long jiffies;
@ -205,7 +204,6 @@ struct slave {
*/ */
struct bonding { struct bonding {
struct net_device *dev; /* first - useful for panic debug */ struct net_device *dev; /* first - useful for panic debug */
struct list_head slave_list;
struct slave *curr_active_slave; struct slave *curr_active_slave;
struct slave *current_arp_slave; struct slave *current_arp_slave;
struct slave *primary_slave; struct slave *primary_slave;