diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2022-08-19 14:58:42 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2022-08-25 10:41:27 +0200 |
| commit | 65f7052b6c38f767d95ebfa4ae4b389b6da6a421 (patch) | |
| tree | 1de6c9c21f3f637ab3cd786b36f5d49170b8feb5 /drivers/net/wireless/mac80211_hwsim.c | |
| parent | c73993b865bf0b2ea1cbb3e9616f18a6508fc49c (diff) | |
| download | linux-65f7052b6c38f767d95ebfa4ae4b389b6da6a421.tar.bz2 | |
wifi: mac80211_hwsim: fix link change handling
The code for determining which links to update in wmediumd
or virtio was wrong, fix it to remove the deflink only if
there were no old links, and also add the deflink if there
are no other new links.
Fixes: c204d9df0202 ("wifi: mac80211_hwsim: handle links for wmediumd/virtio")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/mac80211_hwsim.c')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 68c7fe9edecc..4fb8f68e5c3b 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -2995,10 +2995,15 @@ static int mac80211_hwsim_change_vif_links(struct ieee80211_hw *hw, u16 old_links, u16 new_links, struct ieee80211_bss_conf *old[IEEE80211_MLD_MAX_NUM_LINKS]) { - unsigned long rem = old_links & ~new_links ?: BIT(0); + unsigned long rem = old_links & ~new_links; unsigned long add = new_links & ~old_links; int i; + if (!old_links) + rem |= BIT(0); + if (!new_links) + add |= BIT(0); + for_each_set_bit(i, &rem, IEEE80211_MLD_MAX_NUM_LINKS) mac80211_hwsim_config_mac_nl(hw, old[i]->addr, false); |