]> www.infradead.org Git - linux.git/commitdiff
wifi: mac80211: correctly set active links upon TTLM
authorAyala Beker <ayala.beker@intel.com>
Mon, 18 Mar 2024 16:53:22 +0000 (18:53 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 25 Mar 2024 14:23:07 +0000 (15:23 +0100)
Fix ieee80211_ttlm_set_links() to not set all active links,
but instead let the driver know that valid links status changed
and select the active links properly.

Fixes: 8f500fbc6c65 ("wifi: mac80211: process and save negotiated TID to Link mapping request")
Signed-off-by: Ayala Beker <ayala.beker@intel.com>
Reviewed-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240318184907.acddbbf39584.Ide858f95248fcb3e483c97fcaa14b0cd4e964b10@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/mlme.c

index 202b2ddb4cc151ff950406bd1c92820d956b4884..96b70006b7fc0b11b12f423fb74ec32a030d91af 100644 (file)
@@ -5874,6 +5874,15 @@ static int ieee80211_ttlm_set_links(struct ieee80211_sub_if_data *sdata,
        }
 
        if (sdata->vif.active_links != active_links) {
+               /* usable links are affected when active_links are changed,
+                * so notify the driver about the status change
+                */
+               changed |= BSS_CHANGED_MLD_VALID_LINKS;
+               active_links &= sdata->vif.active_links;
+               if (!active_links)
+                       active_links =
+                               BIT(__ffs(sdata->vif.valid_links &
+                                   ~dormant_links));
                ret = ieee80211_set_active_links(&sdata->vif, active_links);
                if (ret) {
                        sdata_info(sdata, "Failed to set TTLM active links\n");
@@ -5888,7 +5897,6 @@ static int ieee80211_ttlm_set_links(struct ieee80211_sub_if_data *sdata,
                goto out;
        }
 
-       changed |= BSS_CHANGED_MLD_VALID_LINKS;
        sdata->vif.suspended_links = suspended_links;
        if (sdata->vif.suspended_links)
                changed |= BSS_CHANGED_MLD_TTLM;