Skip to content

Commit 9f7213a

Browse files
committed
Merge: bonding: report duplicate MAC address in all situations
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/587 JIRA: https://issues.redhat.com/browse/RHEL-73803 Signed-off-by: Hangbin Liu <haliu@redhat.com> Approved-by: Corinna Vinschen <vinschen@redhat.com> Approved-by: Antoine Tenart <atenart@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Julio Faracco <jfaracco@redhat.com>
2 parents bbabcf0 + acf8a99 commit 9f7213a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/net/bonding/bond_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2551,7 +2551,7 @@ static int __bond_release_one(struct net_device *bond_dev,
25512551

25522552
RCU_INIT_POINTER(bond->current_arp_slave, NULL);
25532553

2554-
if (!all && (!bond->params.fail_over_mac ||
2554+
if (!all && (bond->params.fail_over_mac != BOND_FOM_ACTIVE ||
25552555
BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP)) {
25562556
if (ether_addr_equal_64bits(bond_dev->dev_addr, slave->perm_hwaddr) &&
25572557
bond_has_slaves(bond))

0 commit comments

Comments
 (0)