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 v4 net-next 20/27] bonding: remove bond_prev_slave()
Date: Tue, 24 Sep 2013 13:47:00 +0200 [thread overview]
Message-ID: <1380023227-9576-21-git-send-email-vfalico@redhat.com> (raw)
In-Reply-To: <1380023227-9576-1-git-send-email-vfalico@redhat.com>
We don't really need it, and it's really hard to RCUify the list->prev.
CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
---
Notes:
v3 -> v4:
No change.
v2 -> v3:
No change.
v1 -> v2:
No changes.
RFC -> v1:
New patch.
drivers/net/bonding/bond_main.c | 9 +++------
drivers/net/bonding/bonding.h | 4 ----
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 06ffc8a..6aa345a 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1255,7 +1255,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
{
struct bonding *bond = netdev_priv(bond_dev);
const struct net_device_ops *slave_ops = slave_dev->netdev_ops;
- struct slave *new_slave = NULL;
+ struct slave *new_slave = NULL, *prev_slave;
struct sockaddr addr;
int link_reporting;
int res = 0, i;
@@ -1472,6 +1472,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
write_lock_bh(&bond->lock);
+ prev_slave = bond_last_slave(bond);
bond_attach_slave(bond, new_slave);
new_slave->delay = 0;
@@ -1566,9 +1567,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
*/
bond_3ad_initialize(bond, 1000/AD_TIMER_INTERVAL);
} else {
- struct slave *prev_slave;
-
- prev_slave = bond_prev_slave(bond, new_slave);
SLAVE_AD_INFO(new_slave).id =
SLAVE_AD_INFO(prev_slave).id + 1;
}
@@ -3506,9 +3504,8 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
*/
bond_for_each_slave(bond, slave, iter) {
- pr_debug("s %p s->p %p c_m %p\n",
+ pr_debug("s %p c_m %p\n",
slave,
- bond_prev_slave(bond, slave),
slave->dev->netdev_ops->ndo_change_mtu);
res = dev_set_mtu(slave->dev, new_mtu);
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 0b4c4ff..5157153 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -96,10 +96,6 @@
(bond_is_last_slave(bond, pos) ? bond_first_slave(bond) : \
bond_to_slave((pos)->list.next))
-#define bond_prev_slave(bond, pos) \
- (bond_is_first_slave(bond, pos) ? bond_last_slave(bond) : \
- bond_to_slave((pos)->list.prev))
-
/**
* bond_for_each_slave - iterate over all slaves
* @bond: the bond holding this list
--
1.8.4
next prev parent reply other threads:[~2013-09-24 11:47 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-24 11:46 [PATCH v4 net-next 00/27] bonding: use neighbours instead of own lists Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 01/27] net: use lists as arguments instead of bool upper Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 02/27] net: add adj_list to save only neighbours Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 03/27] net: add RCU variant to search for netdev_adjacent link Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 04/27] net: add netdev_adjacent->private and allow to use it Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 05/27] bonding: populate neighbour's private on enslave Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 06/27] bonding: modify bond_get_slave_by_dev() to use neighbours Veaceslav Falico
2013-09-24 19:19 ` David Miller
2013-09-24 19:39 ` Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 07/27] net: add for_each iterators through neighbour lower link's private Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 08/27] bonding: remove bond_for_each_slave_continue_reverse() Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 09/27] bonding: make bond_for_each_slave() use lower neighbour's private Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 10/27] bonding: use bond_for_each_slave() in bond_uninit() Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 11/27] bonding: rework bond_3ad_xmit_xor() to use bond_for_each_slave() only Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 12/27] bonding: rework rlb_next_rx_slave() to use bond_for_each_slave() Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 13/27] bonding: rework bond_find_best_slave() " Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 14/27] bonding: rework bond_ab_arp_probe() " Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 15/27] bonding: remove unused bond_for_each_slave_from() Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 16/27] bonding: add bond_has_slaves() and use it Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 17/27] bonding: convert bond_has_slaves() to use the neighbour list Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 18/27] net: add a possibility to get private from netdev_adjacent->list Veaceslav Falico
2013-09-24 11:46 ` [PATCH v4 net-next 19/27] bonding: convert first/last slave logic to use neighbours Veaceslav Falico
2013-09-24 11:47 ` Veaceslav Falico [this message]
2013-09-24 11:47 ` [PATCH v4 net-next 21/27] bonding: add __bond_next_slave() which uses neighbours Veaceslav Falico
2013-09-24 11:47 ` [PATCH v4 net-next 22/27] bonding: use neighbours for bond_next_slave() Veaceslav Falico
2013-09-24 11:47 ` [PATCH v4 net-next 23/27] bonding: remove slave lists Veaceslav Falico
2013-09-24 11:47 ` [PATCH v4 net-next 24/27] vlan: link the upper neighbour only after registering Veaceslav Falico
2013-09-24 11:47 ` [PATCH v4 net-next 25/27] vlan: unlink the upper neighbour before unregistering Veaceslav Falico
2013-09-24 11:47 ` [PATCH v4 net-next 26/27] net: expose the master link to sysfs, and remove it from bond Veaceslav Falico
2013-09-24 11:47 ` [PATCH v4 net-next 27/27] net: create sysfs symlinks for neighbour devices 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=1380023227-9576-21-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).