From: Ilan Peer Date: Thu, 28 Sep 2023 14:35:31 +0000 (+0300) Subject: wifi: mac80211: Fix setting vif links X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e7182c4e6bbeafa272612e6c06fa92b42ad107ad;p=linux.git 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 Signed-off-by: Gregory Greenman Link: https://lore.kernel.org/r/20230928172905.0357b6306587.I7dbfec347949b629fea680d246a650d6207ff217@changeid Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/link.c b/net/mac80211/link.c index 76c61a132569f..bf7bd880d0623 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 */