Skip to content

L
linux
Commit 9caff1e7 authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller
Browse files
Options

bonding: make bond_for_each_slave() use lower neighbour's private 

It needs a list_head *iter, so add it wherever needed. Use both non-rcu and
rcu variants.

CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
CC: Dimitris Michailidis <dm@chelsio.com>
Signed-off-by: default avatarVeaceslav Falico <vfalico@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 81f23b13
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 55 deletions
drivers/net/bonding/bond_3ad.c
View file @ 9caff1e7
...@@ -2419,6 +2419,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev) ...@@ -2419,6 +2419,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
{ {
struct slave *slave, *start_at; struct slave *slave, *start_at;
struct bonding *bond = netdev_priv(dev); struct bonding *bond = netdev_priv(dev);
struct list_head *iter;
int slave_agg_no; int slave_agg_no;
int slaves_in_agg; int slaves_in_agg;
int agg_id; int agg_id;
...@@ -2444,7 +2445,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev) ...@@ -2444,7 +2445,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
slave_agg_no = bond->xmit_hash_policy(skb, slaves_in_agg); slave_agg_no = bond->xmit_hash_policy(skb, slaves_in_agg);
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
struct aggregator *agg = SLAVE_AD_INFO(slave).port.aggregator; struct aggregator *agg = SLAVE_AD_INFO(slave).port.aggregator;
if (agg && (agg->aggregator_identifier == agg_id)) { if (agg && (agg->aggregator_identifier == agg_id)) {
...@@ -2515,11 +2516,12 @@ int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond, ...@@ -2515,11 +2516,12 @@ int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,
void bond_3ad_update_lacp_rate(struct bonding *bond) void bond_3ad_update_lacp_rate(struct bonding *bond)
{ {
struct port *port = NULL; struct port *port = NULL;
struct list_head *iter;
struct slave *slave; struct slave *slave;
int lacp_fast; int lacp_fast;
lacp_fast = bond->params.lacp_fast; lacp_fast = bond->params.lacp_fast;
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
port = &(SLAVE_AD_INFO(slave).port); port = &(SLAVE_AD_INFO(slave).port);
__get_state_machine_lock(port); __get_state_machine_lock(port);
if (lacp_fast) if (lacp_fast)
......
drivers/net/bonding/bond_alb.c
View file @ 9caff1e7
...@@ -223,13 +223,14 @@ static long long compute_gap(struct slave *slave) ...@@ -223,13 +223,14 @@ static long long compute_gap(struct slave *slave)
static struct slave *tlb_get_least_loaded_slave(struct bonding *bond) static struct slave *tlb_get_least_loaded_slave(struct bonding *bond)
{ {
struct slave *slave, *least_loaded; struct slave *slave, *least_loaded;
struct list_head *iter;
long long max_gap; long long max_gap;
least_loaded = NULL; least_loaded = NULL;
max_gap = LLONG_MIN; max_gap = LLONG_MIN;
/* Find the slave with the largest gap */ /* Find the slave with the largest gap */
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
if (SLAVE_IS_OK(slave)) { if (SLAVE_IS_OK(slave)) {
long long gap = compute_gap(slave); long long gap = compute_gap(slave);
...@@ -1172,8 +1173,9 @@ static void alb_change_hw_addr_on_detach(struct bonding *bond, struct slave *sla ...@@ -1172,8 +1173,9 @@ static void alb_change_hw_addr_on_detach(struct bonding *bond, struct slave *sla
*/ */
static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slave *slave) static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slave *slave)
{ {
struct slave *tmp_slave1, *free_mac_slave = NULL;
struct slave *has_bond_addr = bond->curr_active_slave; struct slave *has_bond_addr = bond->curr_active_slave;
struct slave *tmp_slave1, *free_mac_slave = NULL;
struct list_head *iter;
if (list_empty(&bond->slave_list)) { if (list_empty(&bond->slave_list)) {
/* this is the first slave */ /* this is the first slave */
...@@ -1196,7 +1198,7 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav ...@@ -1196,7 +1198,7 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
/* The slave's address is equal to the address of the bond. /* The slave's address is equal to the address of the bond.
* Search for a spare address in the bond for this slave. * Search for a spare address in the bond for this slave.
*/ */
bond_for_each_slave(bond, tmp_slave1) { bond_for_each_slave(bond, tmp_slave1, iter) {
if (!bond_slave_has_mac(bond, tmp_slave1->perm_hwaddr)) { if (!bond_slave_has_mac(bond, tmp_slave1->perm_hwaddr)) {
/* no slave has tmp_slave1's perm addr /* no slave has tmp_slave1's perm addr
* as its curr addr * as its curr addr
...@@ -1247,6 +1249,7 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav ...@@ -1247,6 +1249,7 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
static int alb_set_mac_address(struct bonding *bond, void *addr) static int alb_set_mac_address(struct bonding *bond, void *addr)
{ {
struct slave *slave, *rollback_slave; struct slave *slave, *rollback_slave;
struct list_head *iter;
struct sockaddr sa; struct sockaddr sa;
char tmp_addr[ETH_ALEN]; char tmp_addr[ETH_ALEN];
int res; int res;
...@@ -1254,7 +1257,7 @@ static int alb_set_mac_address(struct bonding *bond, void *addr) ...@@ -1254,7 +1257,7 @@ static int alb_set_mac_address(struct bonding *bond, void *addr)
if (bond->alb_info.rlb_enabled) if (bond->alb_info.rlb_enabled)
return 0; return 0;
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
/* save net_device's current hw address */ /* save net_device's current hw address */
memcpy(tmp_addr, slave->dev->dev_addr, ETH_ALEN); memcpy(tmp_addr, slave->dev->dev_addr, ETH_ALEN);
...@@ -1274,7 +1277,7 @@ static int alb_set_mac_address(struct bonding *bond, void *addr) ...@@ -1274,7 +1277,7 @@ static int alb_set_mac_address(struct bonding *bond, void *addr)
sa.sa_family = bond->dev->type; sa.sa_family = bond->dev->type;
/* unwind from head to the slave that failed */ /* unwind from head to the slave that failed */
bond_for_each_slave(bond, rollback_slave) { bond_for_each_slave(bond, rollback_slave, iter) {
if (rollback_slave == slave) if (rollback_slave == slave)
break; break;
memcpy(tmp_addr, rollback_slave->dev->dev_addr, ETH_ALEN); memcpy(tmp_addr, rollback_slave->dev->dev_addr, ETH_ALEN);
...@@ -1460,6 +1463,7 @@ void bond_alb_monitor(struct work_struct *work) ...@@ -1460,6 +1463,7 @@ void bond_alb_monitor(struct work_struct *work)
struct bonding *bond = container_of(work, struct bonding, struct bonding *bond = container_of(work, struct bonding,
alb_work.work); alb_work.work);
struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
struct list_head *iter;
struct slave *slave; struct slave *slave;
read_lock(&bond->lock); read_lock(&bond->lock);
...@@ -1482,7 +1486,7 @@ void bond_alb_monitor(struct work_struct *work) ...@@ -1482,7 +1486,7 @@ void bond_alb_monitor(struct work_struct *work)
*/ */
read_lock(&bond->curr_slave_lock); read_lock(&bond->curr_slave_lock);
bond_for_each_slave(bond, slave) bond_for_each_slave(bond, slave, iter)
alb_send_learning_packets(slave, slave->dev->dev_addr); alb_send_learning_packets(slave, slave->dev->dev_addr);
read_unlock(&bond->curr_slave_lock); read_unlock(&bond->curr_slave_lock);
...@@ -1495,7 +1499,7 @@ void bond_alb_monitor(struct work_struct *work) ...@@ -1495,7 +1499,7 @@ void bond_alb_monitor(struct work_struct *work)
read_lock(&bond->curr_slave_lock); read_lock(&bond->curr_slave_lock);
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
tlb_clear_slave(bond, slave, 1); tlb_clear_slave(bond, slave, 1);
if (slave == bond->curr_active_slave) { if (slave == bond->curr_active_slave) {
SLAVE_TLB_INFO(slave).load = SLAVE_TLB_INFO(slave).load =
......
drivers/net/bonding/bond_main.c
View file @ 9caff1e7
...@@ -333,9 +333,10 @@ static int bond_vlan_rx_add_vid(struct net_device *bond_dev, ...@@ -333,9 +333,10 @@ static int bond_vlan_rx_add_vid(struct net_device *bond_dev,
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct slave *slave, *rollback_slave; struct slave *slave, *rollback_slave;
struct list_head *iter;
int res; int res;
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
res = vlan_vid_add(slave->dev, proto, vid); res = vlan_vid_add(slave->dev, proto, vid);
if (res) if (res)
goto unwind; goto unwind;
...@@ -345,7 +346,7 @@ static int bond_vlan_rx_add_vid(struct net_device *bond_dev, ...@@ -345,7 +346,7 @@ static int bond_vlan_rx_add_vid(struct net_device *bond_dev,
unwind: unwind:
/* unwind to the slave that failed */ /* unwind to the slave that failed */
bond_for_each_slave(bond, rollback_slave) { bond_for_each_slave(bond, rollback_slave, iter) {
if (rollback_slave == slave) if (rollback_slave == slave)
break; break;
...@@ -364,9 +365,10 @@ static int bond_vlan_rx_kill_vid(struct net_device *bond_dev, ...@@ -364,9 +365,10 @@ static int bond_vlan_rx_kill_vid(struct net_device *bond_dev,
__be16 proto, u16 vid) __be16 proto, u16 vid)
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct list_head *iter;
struct slave *slave; struct slave *slave;
bond_for_each_slave(bond, slave) bond_for_each_slave(bond, slave, iter)
vlan_vid_del(slave->dev, proto, vid); vlan_vid_del(slave->dev, proto, vid);
if (bond_is_lb(bond)) if (bond_is_lb(bond))
...@@ -386,6 +388,7 @@ static int bond_vlan_rx_kill_vid(struct net_device *bond_dev, ...@@ -386,6 +388,7 @@ static int bond_vlan_rx_kill_vid(struct net_device *bond_dev,
*/ */
static int bond_set_carrier(struct bonding *bond) static int bond_set_carrier(struct bonding *bond)
{ {
struct list_head *iter;
struct slave *slave; struct slave *slave;
if (list_empty(&bond->slave_list)) if (list_empty(&bond->slave_list))
...@@ -394,7 +397,7 @@ static int bond_set_carrier(struct bonding *bond) ...@@ -394,7 +397,7 @@ static int bond_set_carrier(struct bonding *bond)
if (bond->params.mode == BOND_MODE_8023AD) if (bond->params.mode == BOND_MODE_8023AD)
return bond_3ad_set_carrier(bond); return bond_3ad_set_carrier(bond);
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
if (slave->link == BOND_LINK_UP) { if (slave->link == BOND_LINK_UP) {
if (!netif_carrier_ok(bond->dev)) { if (!netif_carrier_ok(bond->dev)) {
netif_carrier_on(bond->dev); netif_carrier_on(bond->dev);
...@@ -526,7 +529,9 @@ static int bond_check_dev_link(struct bonding *bond, ...@@ -526,7 +529,9 @@ static int bond_check_dev_link(struct bonding *bond,
*/ */
static int bond_set_promiscuity(struct bonding *bond, int inc) static int bond_set_promiscuity(struct bonding *bond, int inc)
{ {
struct list_head *iter;
int err = 0; int err = 0;
if (USES_PRIMARY(bond->params.mode)) { if (USES_PRIMARY(bond->params.mode)) {
/* write lock already acquired */ /* write lock already acquired */
if (bond->curr_active_slave) { if (bond->curr_active_slave) {
...@@ -536,7 +541,7 @@ static int bond_set_promiscuity(struct bonding *bond, int inc) ...@@ -536,7 +541,7 @@ static int bond_set_promiscuity(struct bonding *bond, int inc)
} else { } else {
struct slave *slave; struct slave *slave;
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
err = dev_set_promiscuity(slave->dev, inc); err = dev_set_promiscuity(slave->dev, inc);
if (err) if (err)
return err; return err;
...@@ -550,7 +555,9 @@ static int bond_set_promiscuity(struct bonding *bond, int inc) ...@@ -550,7 +555,9 @@ static int bond_set_promiscuity(struct bonding *bond, int inc)
*/ */
static int bond_set_allmulti(struct bonding *bond, int inc) static int bond_set_allmulti(struct bonding *bond, int inc)
{ {
struct list_head *iter;
int err = 0; int err = 0;
if (USES_PRIMARY(bond->params.mode)) { if (USES_PRIMARY(bond->params.mode)) {
/* write lock already acquired */ /* write lock already acquired */
if (bond->curr_active_slave) { if (bond->curr_active_slave) {
...@@ -560,7 +567,7 @@ static int bond_set_allmulti(struct bonding *bond, int inc) ...@@ -560,7 +567,7 @@ static int bond_set_allmulti(struct bonding *bond, int inc)
} else { } else {
struct slave *slave; struct slave *slave;
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
err = dev_set_allmulti(slave->dev, inc); err = dev_set_allmulti(slave->dev, inc);
if (err) if (err)
return err; return err;
...@@ -1050,9 +1057,10 @@ static void bond_poll_controller(struct net_device *bond_dev) ...@@ -1050,9 +1057,10 @@ static void bond_poll_controller(struct net_device *bond_dev)
static void bond_netpoll_cleanup(struct net_device *bond_dev) static void bond_netpoll_cleanup(struct net_device *bond_dev)
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct list_head *iter;
struct slave *slave; struct slave *slave;
bond_for_each_slave(bond, slave) bond_for_each_slave(bond, slave, iter)
if (IS_UP(slave->dev)) if (IS_UP(slave->dev))
slave_disable_netpoll(slave); slave_disable_netpoll(slave);
} }
...@@ -1060,10 +1068,11 @@ static void bond_netpoll_cleanup(struct net_device *bond_dev) ...@@ -1060,10 +1068,11 @@ static void bond_netpoll_cleanup(struct net_device *bond_dev)
static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni, gfp_t gfp) static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni, gfp_t gfp)
{ {
struct bonding *bond = netdev_priv(dev); struct bonding *bond = netdev_priv(dev);
struct list_head *iter;
struct slave *slave; struct slave *slave;
int err = 0; int err = 0;
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
err = slave_enable_netpoll(slave); err = slave_enable_netpoll(slave);
if (err) { if (err) {
bond_netpoll_cleanup(dev); bond_netpoll_cleanup(dev);
...@@ -1091,6 +1100,7 @@ static netdev_features_t bond_fix_features(struct net_device *dev, ...@@ -1091,6 +1100,7 @@ static netdev_features_t bond_fix_features(struct net_device *dev,
netdev_features_t features) netdev_features_t features)
{ {
struct bonding *bond = netdev_priv(dev); struct bonding *bond = netdev_priv(dev);
struct list_head *iter;
netdev_features_t mask; netdev_features_t mask;
struct slave *slave; struct slave *slave;
...@@ -1104,7 +1114,7 @@ static netdev_features_t bond_fix_features(struct net_device *dev, ...@@ -1104,7 +1114,7 @@ static netdev_features_t bond_fix_features(struct net_device *dev,
features &= ~NETIF_F_ONE_FOR_ALL; features &= ~NETIF_F_ONE_FOR_ALL;
features |= NETIF_F_ALL_FOR_ALL; features |= NETIF_F_ALL_FOR_ALL;
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
features = netdev_increment_features(features, features = netdev_increment_features(features,
slave->dev->features, slave->dev->features,
mask); mask);
...@@ -1122,16 +1132,17 @@ static void bond_compute_features(struct bonding *bond) ...@@ -1122,16 +1132,17 @@ static void bond_compute_features(struct bonding *bond)
{ {
unsigned int flags, dst_release_flag = IFF_XMIT_DST_RELEASE; unsigned int flags, dst_release_flag = IFF_XMIT_DST_RELEASE;
netdev_features_t vlan_features = BOND_VLAN_FEATURES; netdev_features_t vlan_features = BOND_VLAN_FEATURES;
struct net_device *bond_dev = bond->dev;
struct list_head *iter;
struct slave *slave;
unsigned short max_hard_header_len = ETH_HLEN; unsigned short max_hard_header_len = ETH_HLEN;
unsigned int gso_max_size = GSO_MAX_SIZE; unsigned int gso_max_size = GSO_MAX_SIZE;
struct net_device *bond_dev = bond->dev;
u16 gso_max_segs = GSO_MAX_SEGS; u16 gso_max_segs = GSO_MAX_SEGS;
struct slave *slave;
if (list_empty(&bond->slave_list)) if (list_empty(&bond->slave_list))
goto done; goto done;
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
vlan_features = netdev_increment_features(vlan_features, vlan_features = netdev_increment_features(vlan_features,
slave->dev->vlan_features, BOND_VLAN_FEATURES); slave->dev->vlan_features, BOND_VLAN_FEATURES);
...@@ -1993,11 +2004,12 @@ static int bond_info_query(struct net_device *bond_dev, struct ifbond *info) ...@@ -1993,11 +2004,12 @@ static int bond_info_query(struct net_device *bond_dev, struct ifbond *info)
static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *info) static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *info)
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct list_head *iter;
int i = 0, res = -ENODEV; int i = 0, res = -ENODEV;
struct slave *slave; struct slave *slave;
read_lock(&bond->lock); read_lock(&bond->lock);
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
if (i++ == (int)info->slave_id) { if (i++ == (int)info->slave_id) {
res = 0; res = 0;
strcpy(info->slave_name, slave->dev->name); strcpy(info->slave_name, slave->dev->name);
...@@ -2018,12 +2030,13 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in ...@@ -2018,12 +2030,13 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in
static int bond_miimon_inspect(struct bonding *bond) static int bond_miimon_inspect(struct bonding *bond)
{ {
int link_state, commit = 0; int link_state, commit = 0;
struct list_head *iter;
struct slave *slave; struct slave *slave;
bool ignore_updelay; bool ignore_updelay;
ignore_updelay = !bond->curr_active_slave ? true : false; ignore_updelay = !bond->curr_active_slave ? true : false;
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
slave->new_link = BOND_LINK_NOCHANGE; slave->new_link = BOND_LINK_NOCHANGE;
link_state = bond_check_dev_link(bond, slave->dev, 0); link_state = bond_check_dev_link(bond, slave->dev, 0);
...@@ -2117,9 +2130,10 @@ static int bond_miimon_inspect(struct bonding *bond) ...@@ -2117,9 +2130,10 @@ static int bond_miimon_inspect(struct bonding *bond)
static void bond_miimon_commit(struct bonding *bond) static void bond_miimon_commit(struct bonding *bond)
{ {
struct list_head *iter;
struct slave *slave; struct slave *slave;
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
switch (slave->new_link) { switch (slave->new_link) {
case BOND_LINK_NOCHANGE: case BOND_LINK_NOCHANGE:
continue; continue;
...@@ -2513,6 +2527,7 @@ void bond_loadbalance_arp_mon(struct work_struct *work) ...@@ -2513,6 +2527,7 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
struct bonding *bond = container_of(work, struct bonding, struct bonding *bond = container_of(work, struct bonding,
arp_work.work); arp_work.work);
struct slave *slave, *oldcurrent; struct slave *slave, *oldcurrent;
struct list_head *iter;
int do_failover = 0; int do_failover = 0;
read_lock(&bond->lock); read_lock(&bond->lock);
...@@ -2529,7 +2544,7 @@ void bond_loadbalance_arp_mon(struct work_struct *work) ...@@ -2529,7 +2544,7 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
* TODO: what about up/down delay in arp mode? it wasn't here before * TODO: what about up/down delay in arp mode? it wasn't here before
* so it can wait * so it can wait
*/ */
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
unsigned long trans_start = dev_trans_start(slave->dev); unsigned long trans_start = dev_trans_start(slave->dev);
if (slave->link != BOND_LINK_UP) { if (slave->link != BOND_LINK_UP) {
...@@ -2620,10 +2635,11 @@ void bond_loadbalance_arp_mon(struct work_struct *work) ...@@ -2620,10 +2635,11 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
static int bond_ab_arp_inspect(struct bonding *bond) static int bond_ab_arp_inspect(struct bonding *bond)
{ {
unsigned long trans_start, last_rx; unsigned long trans_start, last_rx;
struct list_head *iter;
struct slave *slave; struct slave *slave;
int commit = 0; int commit = 0;
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
slave->new_link = BOND_LINK_NOCHANGE; slave->new_link = BOND_LINK_NOCHANGE;
last_rx = slave_last_rx(bond, slave); last_rx = slave_last_rx(bond, slave);
...@@ -2690,9 +2706,10 @@ static int bond_ab_arp_inspect(struct bonding *bond) ...@@ -2690,9 +2706,10 @@ static int bond_ab_arp_inspect(struct bonding *bond)
static void bond_ab_arp_commit(struct bonding *bond) static void bond_ab_arp_commit(struct bonding *bond)
{ {
unsigned long trans_start; unsigned long trans_start;
struct list_head *iter;
struct slave *slave; struct slave *slave;
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
switch (slave->new_link) { switch (slave->new_link) {
case BOND_LINK_NOCHANGE: case BOND_LINK_NOCHANGE:
continue; continue;
...@@ -3156,13 +3173,14 @@ static void bond_work_cancel_all(struct bonding *bond) ...@@ -3156,13 +3173,14 @@ static void bond_work_cancel_all(struct bonding *bond)
static int bond_open(struct net_device *bond_dev) static int bond_open(struct net_device *bond_dev)
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct list_head *iter;
struct slave *slave; struct slave *slave;
/* reset slave->backup and slave->inactive */ /* reset slave->backup and slave->inactive */
read_lock(&bond->lock); read_lock(&bond->lock);
if (!list_empty(&bond->slave_list)) { if (!list_empty(&bond->slave_list)) {
read_lock(&bond->curr_slave_lock); read_lock(&bond->curr_slave_lock);
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
if ((bond->params.mode == BOND_MODE_ACTIVEBACKUP) if ((bond->params.mode == BOND_MODE_ACTIVEBACKUP)
&& (slave != bond->curr_active_slave)) { && (slave != bond->curr_active_slave)) {
bond_set_slave_inactive_flags(slave); bond_set_slave_inactive_flags(slave);
...@@ -3222,12 +3240,13 @@ static struct rtnl_link_stats64 *bond_get_stats(struct net_device *bond_dev, ...@@ -3222,12 +3240,13 @@ static struct rtnl_link_stats64 *bond_get_stats(struct net_device *bond_dev,
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct rtnl_link_stats64 temp; struct rtnl_link_stats64 temp;
struct list_head *iter;
struct slave *slave; struct slave *slave;
memset(stats, 0, sizeof(*stats)); memset(stats, 0, sizeof(*stats));
read_lock_bh(&bond->lock); read_lock_bh(&bond->lock);
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
const struct rtnl_link_stats64 *sstats = const struct rtnl_link_stats64 *sstats =
dev_get_stats(slave->dev, &temp); dev_get_stats(slave->dev, &temp);
...@@ -3394,6 +3413,7 @@ static void bond_change_rx_flags(struct net_device *bond_dev, int change) ...@@ -3394,6 +3413,7 @@ static void bond_change_rx_flags(struct net_device *bond_dev, int change)
static void bond_set_rx_mode(struct net_device *bond_dev) static void bond_set_rx_mode(struct net_device *bond_dev)
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct list_head *iter;
struct slave *slave; struct slave *slave;
ASSERT_RTNL(); ASSERT_RTNL();
...@@ -3405,7 +3425,7 @@ static void bond_set_rx_mode(struct net_device *bond_dev) ...@@ -3405,7 +3425,7 @@ static void bond_set_rx_mode(struct net_device *bond_dev)
dev_mc_sync(slave->dev, bond_dev); dev_mc_sync(slave->dev, bond_dev);
} }
} else { } else {
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
dev_uc_sync_multiple(slave->dev, bond_dev); dev_uc_sync_multiple(slave->dev, bond_dev);
dev_mc_sync_multiple(slave->dev, bond_dev); dev_mc_sync_multiple(slave->dev, bond_dev);
} }
...@@ -3473,6 +3493,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu) ...@@ -3473,6 +3493,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct slave *slave, *rollback_slave; struct slave *slave, *rollback_slave;
struct list_head *iter;
int res = 0; int res = 0;
pr_debug("bond=%p, name=%s, new_mtu=%d\n", bond, pr_debug("bond=%p, name=%s, new_mtu=%d\n", bond,
...@@ -3493,7 +3514,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu) ...@@ -3493,7 +3514,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
* call to the base driver. * call to the base driver.
*/ */
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
pr_debug("s %p s->p %p c_m %p\n", pr_debug("s %p s->p %p c_m %p\n",
slave, slave,
bond_prev_slave(bond, slave), bond_prev_slave(bond, slave),
...@@ -3521,7 +3542,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu) ...@@ -3521,7 +3542,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
unwind: unwind:
/* unwind from head to the slave that failed */ /* unwind from head to the slave that failed */
bond_for_each_slave(bond, rollback_slave) { bond_for_each_slave(bond, rollback_slave, iter) {
int tmp_res; int tmp_res;
if (rollback_slave == slave) if (rollback_slave == slave)
...@@ -3549,6 +3570,7 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr) ...@@ -3549,6 +3570,7 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr)
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct slave *slave, *rollback_slave; struct slave *slave, *rollback_slave;
struct sockaddr *sa = addr, tmp_sa; struct sockaddr *sa = addr, tmp_sa;
struct list_head *iter;
int res = 0; int res = 0;
if (bond->params.mode == BOND_MODE_ALB) if (bond->params.mode == BOND_MODE_ALB)
...@@ -3582,7 +3604,7 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr) ...@@ -3582,7 +3604,7 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr)
* call to the base driver. * call to the base driver.
*/ */
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
const struct net_device_ops *slave_ops = slave->dev->netdev_ops; const struct net_device_ops *slave_ops = slave->dev->netdev_ops;
pr_debug("slave %p %s\n", slave, slave->dev->name); pr_debug("slave %p %s\n", slave, slave->dev->name);
...@@ -3614,7 +3636,7 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr) ...@@ -3614,7 +3636,7 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr)
tmp_sa.sa_family = bond_dev->type; tmp_sa.sa_family = bond_dev->type;
/* unwind from head to the slave that failed */ /* unwind from head to the slave that failed */
bond_for_each_slave(bond, rollback_slave) { bond_for_each_slave(bond, rollback_slave, iter) {
int tmp_res; int tmp_res;
if (rollback_slave == slave) if (rollback_slave == slave)
...@@ -3642,11 +3664,12 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr) ...@@ -3642,11 +3664,12 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr)
*/ */
void bond_xmit_slave_id(struct bonding *bond, struct sk_buff *skb, int slave_id) void bond_xmit_slave_id(struct bonding *bond, struct sk_buff *skb, int slave_id)
{ {
struct list_head *iter;
struct slave *slave; struct slave *slave;
int i = slave_id; int i = slave_id;
/* Here we start from the slave with slave_id */ /* Here we start from the slave with slave_id */
bond_for_each_slave_rcu(bond, slave) { bond_for_each_slave_rcu(bond, slave, iter) {
if (--i < 0) { if (--i < 0) {
if (slave_can_tx(slave)) { if (slave_can_tx(slave)) {
bond_dev_queue_xmit(bond, skb, slave->dev); bond_dev_queue_xmit(bond, skb, slave->dev);
...@@ -3657,7 +3680,7 @@ void bond_xmit_slave_id(struct bonding *bond, struct sk_buff *skb, int slave_id) ...@@ -3657,7 +3680,7 @@ void bond_xmit_slave_id(struct bonding *bond, struct sk_buff *skb, int slave_id)
/* Here we start from the first slave up to slave_id */ /* Here we start from the first slave up to slave_id */
i = slave_id; i = slave_id;
bond_for_each_slave_rcu(bond, slave) { bond_for_each_slave_rcu(bond, slave, iter) {
if (--i < 0) if (--i < 0)
break; break;
if (slave_can_tx(slave)) { if (slave_can_tx(slave)) {
...@@ -3734,8 +3757,9 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev) ...@@ -3734,8 +3757,9 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct slave *slave = NULL; struct slave *slave = NULL;
struct list_head *iter;
bond_for_each_slave_rcu(bond, slave) { bond_for_each_slave_rcu(bond, slave, iter) {
if (bond_is_last_slave(bond, slave)) if (bond_is_last_slave(bond, slave))
break; break;
if (IS_UP(slave->dev) && slave->link == BOND_LINK_UP) { if (IS_UP(slave->dev) && slave->link == BOND_LINK_UP) {
...@@ -3784,13 +3808,14 @@ static inline int bond_slave_override(struct bonding *bond, ...@@ -3784,13 +3808,14 @@ static inline int bond_slave_override(struct bonding *bond,
{ {
struct slave *slave = NULL; struct slave *slave = NULL;
struct slave *check_slave; struct slave *check_slave;
struct list_head *iter;
int res = 1; int res = 1;
if (!skb->queue_mapping) if (!skb->queue_mapping)
return 1; return 1;
/* Find out if any slaves have the same mapping as this skb. */ /* Find out if any slaves have the same mapping as this skb. */
bond_for_each_slave_rcu(bond, check_slave) { bond_for_each_slave_rcu(bond, check_slave, iter) {
if (check_slave->queue_id == skb->queue_mapping) { if (check_slave->queue_id == skb->queue_mapping) {
slave = check_slave; slave = check_slave;
break; break;
...@@ -3922,6 +3947,7 @@ static int bond_ethtool_get_settings(struct net_device *bond_dev, ...@@ -3922,6 +3947,7 @@ static int bond_ethtool_get_settings(struct net_device *bond_dev,
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
unsigned long speed = 0; unsigned long speed = 0;
struct list_head *iter;
struct slave *slave; struct slave *slave;
ecmd->duplex = DUPLEX_UNKNOWN; ecmd->duplex = DUPLEX_UNKNOWN;
...@@ -3933,7 +3959,7 @@ static int bond_ethtool_get_settings(struct net_device *bond_dev, ...@@ -3933,7 +3959,7 @@ static int bond_ethtool_get_settings(struct net_device *bond_dev,
* this is an accurate maximum. * this is an accurate maximum.
*/ */
read_lock(&bond->lock); read_lock(&bond->lock);
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
if (SLAVE_IS_OK(slave)) { if (SLAVE_IS_OK(slave)) {
if (slave->speed != SPEED_UNKNOWN) if (slave->speed != SPEED_UNKNOWN)
speed += slave->speed; speed += slave->speed;
......
drivers/net/bonding/bond_procfs.c
View file @ 9caff1e7
...@@ -10,8 +10,9 @@ static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos) ...@@ -10,8 +10,9 @@ static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)
__acquires(&bond->lock) __acquires(&bond->lock)
{ {
struct bonding *bond = seq->private; struct bonding *bond = seq->private;
loff_t off = 0; struct list_head *iter;
struct slave *slave; struct slave *slave;
loff_t off = 0;
/* make sure the bond won't be taken away */ /* make sure the bond won't be taken away */
rcu_read_lock(); rcu_read_lock();
...@@ -20,7 +21,7 @@ static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos) ...@@ -20,7 +21,7 @@ static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)
if (*pos == 0) if (*pos == 0)
return SEQ_START_TOKEN; return SEQ_START_TOKEN;
bond_for_each_slave(bond, slave) bond_for_each_slave(bond, slave, iter)
if (++off == *pos) if (++off == *pos)
return slave; return slave;
......
drivers/net/bonding/bond_sysfs.c
View file @ 9caff1e7
...@@ -210,11 +210,12 @@ static ssize_t bonding_show_slaves(struct device *d, ...@@ -210,11 +210,12 @@ static ssize_t bonding_show_slaves(struct device *d,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct bonding *bond = to_bond(d); struct bonding *bond = to_bond(d);
struct list_head *iter;
struct slave *slave; struct slave *slave;
int res = 0; int res = 0;
read_lock(&bond->lock); read_lock(&bond->lock);
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
if (res > (PAGE_SIZE - IFNAMSIZ)) { if (res > (PAGE_SIZE - IFNAMSIZ)) {
/* not enough space for another interface name */ /* not enough space for another interface name */
if ((PAGE_SIZE - res) > 10) if ((PAGE_SIZE - res) > 10)
...@@ -656,6 +657,7 @@ static ssize_t bonding_store_arp_targets(struct device *d, ...@@ -656,6 +657,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct bonding *bond = to_bond(d); struct bonding *bond = to_bond(d);
struct list_head *iter;
struct slave *slave; struct slave *slave;
__be32 newtarget, *targets; __be32 newtarget, *targets;
unsigned long *targets_rx; unsigned long *targets_rx;
...@@ -688,7 +690,7 @@ static ssize_t bonding_store_arp_targets(struct device *d, ...@@ -688,7 +690,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
&newtarget); &newtarget);
/* not to race with bond_arp_rcv */ /* not to race with bond_arp_rcv */
write_lock_bh(&bond->lock); write_lock_bh(&bond->lock);
bond_for_each_slave(bond, slave) bond_for_each_slave(bond, slave, iter)
slave->target_last_arp_rx[ind] = jiffies; slave->target_last_arp_rx[ind] = jiffies;
targets[ind] = newtarget; targets[ind] = newtarget;
write_unlock_bh(&bond->lock); write_unlock_bh(&bond->lock);
...@@ -714,7 +716,7 @@ static ssize_t bonding_store_arp_targets(struct device *d, ...@@ -714,7 +716,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
&newtarget); &newtarget);
write_lock_bh(&bond->lock); write_lock_bh(&bond->lock);
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
targets_rx = slave->target_last_arp_rx; targets_rx = slave->target_last_arp_rx;
j = ind; j = ind;
for (; (j < BOND_MAX_ARP_TARGETS-1) && targets[j+1]; j++) for (; (j < BOND_MAX_ARP_TARGETS-1) && targets[j+1]; j++)
...@@ -1111,6 +1113,7 @@ static ssize_t bonding_store_primary(struct device *d, ...@@ -1111,6 +1113,7 @@ static ssize_t bonding_store_primary(struct device *d,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct bonding *bond = to_bond(d); struct bonding *bond = to_bond(d);
struct list_head *iter;
char ifname[IFNAMSIZ]; char ifname[IFNAMSIZ];
struct slave *slave; struct slave *slave;
...@@ -1138,7 +1141,7 @@ static ssize_t bonding_store_primary(struct device *d, ...@@ -1138,7 +1141,7 @@ static ssize_t bonding_store_primary(struct device *d,
goto out; goto out;
} }
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
if (strncmp(slave->dev->name, ifname, IFNAMSIZ) == 0) { if (strncmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
pr_info("%s: Setting %s as primary slave.\n", pr_info("%s: Setting %s as primary slave.\n",
bond->dev->name, slave->dev->name); bond->dev->name, slave->dev->name);
...@@ -1286,6 +1289,7 @@ static ssize_t bonding_store_active_slave(struct device *d, ...@@ -1286,6 +1289,7 @@ static ssize_t bonding_store_active_slave(struct device *d,
{ {
struct slave *slave, *old_active, *new_active; struct slave *slave, *old_active, *new_active;
struct bonding *bond = to_bond(d); struct bonding *bond = to_bond(d);
struct list_head *iter;
char ifname[IFNAMSIZ]; char ifname[IFNAMSIZ];
if (!rtnl_trylock()) if (!rtnl_trylock())
...@@ -1313,7 +1317,7 @@ static ssize_t bonding_store_active_slave(struct device *d, ...@@ -1313,7 +1317,7 @@ static ssize_t bonding_store_active_slave(struct device *d,
goto out; goto out;
} }
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
if (strncmp(slave->dev->name, ifname, IFNAMSIZ) == 0) { if (strncmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
old_active = bond->curr_active_slave; old_active = bond->curr_active_slave;
new_active = slave; new_active = slave;
...@@ -1493,6 +1497,7 @@ static ssize_t bonding_show_queue_id(struct device *d, ...@@ -1493,6 +1497,7 @@ static ssize_t bonding_show_queue_id(struct device *d,
char *buf) char *buf)
{ {
struct bonding *bond = to_bond(d); struct bonding *bond = to_bond(d);
struct list_head *iter;
struct slave *slave; struct slave *slave;
int res = 0; int res = 0;
...@@ -1500,7 +1505,7 @@ static ssize_t bonding_show_queue_id(struct device *d, ...@@ -1500,7 +1505,7 @@ static ssize_t bonding_show_queue_id(struct device *d,
return restart_syscall(); return restart_syscall();
read_lock(&bond->lock); read_lock(&bond->lock);
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
if (res > (PAGE_SIZE - IFNAMSIZ - 6)) { if (res > (PAGE_SIZE - IFNAMSIZ - 6)) {
/* not enough space for another interface_name:queue_id pair */ /* not enough space for another interface_name:queue_id pair */
if ((PAGE_SIZE - res) > 10) if ((PAGE_SIZE - res) > 10)
...@@ -1529,6 +1534,7 @@ static ssize_t bonding_store_queue_id(struct device *d, ...@@ -1529,6 +1534,7 @@ static ssize_t bonding_store_queue_id(struct device *d,
{ {
struct slave *slave, *update_slave; struct slave *slave, *update_slave;
struct bonding *bond = to_bond(d); struct bonding *bond = to_bond(d);
struct list_head *iter;
u16 qid; u16 qid;
int ret = count; int ret = count;
char *delim; char *delim;
...@@ -1565,7 +1571,7 @@ static ssize_t bonding_store_queue_id(struct device *d, ...@@ -1565,7 +1571,7 @@ static ssize_t bonding_store_queue_id(struct device *d,
/* Search for thes slave and check for duplicate qids */ /* Search for thes slave and check for duplicate qids */
update_slave = NULL; update_slave = NULL;
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
if (sdev == slave->dev) if (sdev == slave->dev)
/* /*
* We don't need to check the matching * We don't need to check the matching
...@@ -1619,6 +1625,7 @@ static ssize_t bonding_store_slaves_active(struct device *d, ...@@ -1619,6 +1625,7 @@ static ssize_t bonding_store_slaves_active(struct device *d,
{ {
struct bonding *bond = to_bond(d); struct bonding *bond = to_bond(d);
int new_value, ret = count; int new_value, ret = count;
struct list_head *iter;
struct slave *slave; struct slave *slave;
if (sscanf(buf, "%d", &new_value) != 1) { if (sscanf(buf, "%d", &new_value) != 1) {
...@@ -1641,7 +1648,7 @@ static ssize_t bonding_store_slaves_active(struct device *d, ...@@ -1641,7 +1648,7 @@ static ssize_t bonding_store_slaves_active(struct device *d,
} }
read_lock(&bond->lock); read_lock(&bond->lock);
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
if (!bond_is_active_slave(slave)) { if (!bond_is_active_slave(slave)) {
if (new_value) if (new_value)
slave->inactive = 0; slave->inactive = 0;
......
drivers/net/bonding/bonding.h
View file @ 9caff1e7
...@@ -110,15 +110,16 @@ ...@@ -110,15 +110,16 @@
* bond_for_each_slave - iterate over all slaves * bond_for_each_slave - iterate over all slaves
* @bond: the bond holding this list * @bond: the bond holding this list
* @pos: current slave * @pos: current slave
* @iter: list_head * iterator
* *
* Caller must hold bond->lock * Caller must hold bond->lock
*/ */
#define bond_for_each_slave(bond, pos) \ #define bond_for_each_slave(bond, pos, iter) \
list_for_each_entry(pos, &(bond)->slave_list, list) netdev_for_each_lower_private((bond)->dev, pos, iter)
/* Caller must have rcu_read_lock */ /* Caller must have rcu_read_lock */
#define bond_for_each_slave_rcu(bond, pos) \ #define bond_for_each_slave_rcu(bond, pos, iter) \
list_for_each_entry_rcu(pos, &(bond)->slave_list, list) netdev_for_each_lower_private_rcu((bond)->dev, pos, iter)
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER
extern atomic_t netpoll_block_tx; extern atomic_t netpoll_block_tx;
...@@ -476,9 +477,10 @@ static inline void bond_destroy_proc_dir(struct bond_net *bn) ...@@ -476,9 +477,10 @@ static inline void bond_destroy_proc_dir(struct bond_net *bn)
static inline struct slave *bond_slave_has_mac(struct bonding *bond, static inline struct slave *bond_slave_has_mac(struct bonding *bond,
const u8 *mac) const u8 *mac)
{ {
struct list_head *iter;
struct slave *tmp; struct slave *tmp;
bond_for_each_slave(bond, tmp) bond_for_each_slave(bond, tmp, iter)
if (ether_addr_equal_64bits(mac, tmp->dev->dev_addr)) if (ether_addr_equal_64bits(mac, tmp->dev->dev_addr))
return tmp; return tmp;
......
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
View file @ 9caff1e7
...@@ -3983,6 +3983,7 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this, ...@@ -3983,6 +3983,7 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this,
struct net_device *event_dev; struct net_device *event_dev;
int ret = NOTIFY_DONE; int ret = NOTIFY_DONE;
struct bonding *bond = netdev_priv(ifa->idev->dev); struct bonding *bond = netdev_priv(ifa->idev->dev);
struct list_head *iter;
struct slave *slave; struct slave *slave;
struct pci_dev *first_pdev = NULL; struct pci_dev *first_pdev = NULL;
...@@ -3995,7 +3996,7 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this, ...@@ -3995,7 +3996,7 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this,
* in all of them only once. * in all of them only once.
*/ */
read_lock(&bond->lock); read_lock(&bond->lock);
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave, iter) {
if (!first_pdev) { if (!first_pdev) {
ret = clip_add(slave->dev, ifa, event); ret = clip_add(slave->dev, ifa, event);
/* If clip_add is success then only initialize /* If clip_add is success then only initialize
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7