diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-08-24 10:07:16 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-08-24 10:07:16 +0200 |
| commit | b251610c676c93f99aff86bcaf1e8ef86650579e (patch) | |
| tree | 28e2d1ea3c2eb4905db671171a2e207d3f556c80 /include | |
| parent | 30188bd7838c16a98a520db1fe9df01ffc6ed368 (diff) | |
| parent | 246af950b9404da3cb1fed0dc85c7a637be0aff6 (diff) | |
Merge branch 'fix-macvlan-over-alb-bond-support'
Hangbin Liu says:
====================
fix macvlan over alb bond support
Currently, the macvlan over alb bond is broken after commit
14af9963ba1e ("bonding: Support macvlans on top of tlb/rlb mode bonds").
Fix this and add relate tests.
====================
Link: https://lore.kernel.org/r/20230823071907.3027782-1-liuhangbin@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bonding.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/net/bonding.h b/include/net/bonding.h index 30ac427cf0c6..5b8b1b644a2d 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -722,23 +722,14 @@ static inline struct slave *bond_slave_has_mac(struct bonding *bond, } /* Caller must hold rcu_read_lock() for read */ -static inline bool bond_slave_has_mac_rx(struct bonding *bond, const u8 *mac) +static inline bool bond_slave_has_mac_rcu(struct bonding *bond, const u8 *mac) { struct list_head *iter; struct slave *tmp; - struct netdev_hw_addr *ha; bond_for_each_slave_rcu(bond, tmp, iter) if (ether_addr_equal_64bits(mac, tmp->dev->dev_addr)) return true; - - if (netdev_uc_empty(bond->dev)) - return false; - - netdev_for_each_uc_addr(ha, bond->dev) - if (ether_addr_equal_64bits(mac, ha->addr)) - return true; - return false; } |