Skip to content

Commit e0caeb2

Browse files
hao022kuba-moo
authored andcommitted
net: bonding: update the slave array for broadcast mode
This patch fixes ce7a381 ("net: bonding: add broadcast_neighbor option for 802.3ad"). Before this commit, on the broadcast mode, all devices were traversed using the bond_for_each_slave_rcu. This patch supports traversing devices by using all_slaves. Therefore, we need to update the slave array when enslave or release slave. Fixes: ce7a381 ("net: bonding: add broadcast_neighbor option for 802.3ad") Cc: Simon Horman <horms@kernel.org> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Andrew Lunn <andrew+netdev@lunn.ch> Cc: <stable@vger.kernel.org> Reported-by: Jiri Slaby <jirislaby@kernel.org> Tested-by: Jiri Slaby <jirislaby@kernel.org> Link: https://lore.kernel.org/all/a97e6e1e-81bc-4a79-8352-9e4794b0d2ca@kernel.org/ Signed-off-by: Tonghao Zhang <tonghao@bamaicloud.com> Reviewed-by: Hangbin Liu <liuhangbin@gmail.com> Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org> Acked-by: Jay Vosburgh <jv@jvosburgh.net> Link: https://patch.msgid.link/20251016125136.16568-1-tonghao@bamaicloud.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent cb74f8c commit e0caeb2

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

drivers/net/bonding/bond_main.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2287,7 +2287,9 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
22872287
unblock_netpoll_tx();
22882288
}
22892289

2290-
if (bond_mode_can_use_xmit_hash(bond))
2290+
/* broadcast mode uses the all_slaves to loop through slaves. */
2291+
if (bond_mode_can_use_xmit_hash(bond) ||
2292+
BOND_MODE(bond) == BOND_MODE_BROADCAST)
22912293
bond_update_slave_arr(bond, NULL);
22922294

22932295
if (!slave_dev->netdev_ops->ndo_bpf ||
@@ -2463,7 +2465,8 @@ static int __bond_release_one(struct net_device *bond_dev,
24632465

24642466
bond_upper_dev_unlink(bond, slave);
24652467

2466-
if (bond_mode_can_use_xmit_hash(bond))
2468+
if (bond_mode_can_use_xmit_hash(bond) ||
2469+
BOND_MODE(bond) == BOND_MODE_BROADCAST)
24672470
bond_update_slave_arr(bond, slave);
24682471

24692472
slave_info(bond_dev, slave_dev, "Releasing %s interface\n",

0 commit comments

Comments
 (0)