aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorIlan Peer2023-09-28 17:35:31 +0300
committerJohannes Berg2023-10-23 11:43:28 +0200
commite7182c4e6bbeafa272612e6c06fa92b42ad107ad (patch)
tree60b7cee3f90438211ca49ead671cf76b466cdff8 /net/mac80211
parent0fca7784b7a14d4ede64f479662afb98876ec7f8 (diff)
wifi: mac80211: Fix setting vif links
When setting the interface links, ignore the change iff both the valid links and the dormant links did not change. This is needed to support cases where the valid links didn't change but the dormant links did. Fixes: 6d543b34dbcf ("wifi: mac80211: Support disabled links during association") Signed-off-by: Ilan Peer <ilan.peer@intel.com> Signed-off-by: Gregory Greenman <gregory.greenman@intel.com> Link: https://lore.kernel.org/r/20230928172905.0357b6306587.I7dbfec347949b629fea680d246a650d6207ff217@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/link.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/link.c b/net/mac80211/link.c
index 76c61a132569..bf7bd880d062 100644
--- a/net/mac80211/link.c
+++ b/net/mac80211/link.c
@@ -195,7 +195,7 @@ static int ieee80211_vif_update_links(struct ieee80211_sub_if_data *sdata,
memset(to_free, 0, sizeof(links));
- if (old_links == new_links)
+ if (old_links == new_links && dormant_links == sdata->vif.dormant_links)
return 0;
/* if there were no old links, need to clear the pointers to deflink */