From: Veaceslav Falico <vfalico@redhat.com>
To: netdev@vger.kernel.org
Cc: jiri@resnulli.us, Veaceslav Falico <vfalico@redhat.com>,
Jay Vosburgh <fubar@us.ibm.com>,
Andy Gospodarek <andy@greyhouse.net>
Subject: [PATCH net-next 23/26] bonding: remove slave lists
Date: Mon, 9 Sep 2013 22:16:41 +0200 [thread overview]
Message-ID: <1378757804-3159-24-git-send-email-vfalico@redhat.com> (raw)
In-Reply-To: <1378757804-3159-1-git-send-email-vfalico@redhat.com>
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>
---
drivers/net/bonding/bond_main.c | 4 ----
drivers/net/bonding/bonding.h | 2 --
2 files changed, 6 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 65eae12..707b0bc 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -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 */
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 9329509..0e8e00e 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -167,7 +167,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;
@@ -207,7 +206,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;
--
1.8.4
next prev parent reply other threads:[~2013-09-09 20:17 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-09 20:16 [PATCH net-next 0/26] bonding: use neighbours instead of own lists Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 01/26] net: add adj_list to save only neighbours Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 02/26] net: add RCU variant to search for netdev_adjacent link Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 03/26] net: uninline netdev neighbour functions Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 04/26] net: add netdev_adjacent->private and allow to use it Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 05/26] bonding: populate neighbour's private on enslave Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 06/26] bonding: modify bond_get_slave_by_dev() to use neighbours Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 07/26] net: add for_each iterators through neighbour lower link's private Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 08/26] bonding: remove bond_for_each_slave_reverse() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 09/26] bonding: make bond_for_each_slave() use lower neighbour's private Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 10/26] bonding: use bond_for_each_slave() in bond_uninit() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 11/26] bonding: rework bond_3ad_xmit_xor() to use bond_for_each_slave() only Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 12/26] bonding: rework rlb_next_rx_slave() to use bond_for_each_slave() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 13/26] bonding: rework bond_find_best_slave() " Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 14/26] bonding: rework bond_ab_arp_probe() " Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 15/26] bonding: remove unused bond_for_each_slave_from() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 16/26] bonding: add bond_has_slaves() and use it Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 17/26] bonding: convert bond_has_slaves() to use the neighbour list Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 18/26] net: add a possibility to get private from netdev_adjacent->list Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 19/26] bonding: convert first/last slave logic to use neighbours Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 20/26] bonding: remove bond_prev_slave() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 21/26] net: add a function to get the next private Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 22/26] bonding: use neighbours for bond_next_slave() Veaceslav Falico
2013-09-09 20:16 ` Veaceslav Falico [this message]
2013-09-09 20:16 ` [PATCH net-next 24/26] net: expose the master link to sysfs, and remove it from bond Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 25/26] vlan: link the upper neighbour only after registering Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 26/26] net: create sysfs symlinks for neighbour devices Veaceslav Falico
2013-09-10 11:08 ` [PATCH net-next 0/26] bonding: use neighbours instead of own lists Ding Tianhong
2013-09-10 16:41 ` Veaceslav Falico
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1378757804-3159-24-git-send-email-vfalico@redhat.com \
--to=vfalico@redhat.com \
--cc=andy@greyhouse.net \
--cc=fubar@us.ibm.com \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).