]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mac80211: recalc min chandef for new STA links
authorJohannes Berg <johannes.berg@intel.com>
Sun, 4 Jun 2023 09:11:20 +0000 (12:11 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Jul 2023 17:39:28 +0000 (19:39 +0200)
[ Upstream commit ba7af2654e3b7b810c750b3c6106f6f20b81cc88 ]

When adding a new link to a station, this needs to cause a
recalculation of the minimum chandef since otherwise we can
have a higher bandwidth station connected on that link than
the link is operating at. Do the appropriate recalc.

Fixes: cb71f1d136a6 ("wifi: mac80211: add sta link addition/removal")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230604120651.377adf3c789a.I91bf28f399e16e6ac1f83bacd1029a698b4e6685@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/mac80211/sta_info.c

index 941bda9141faab6883a0e7a715eee47d1e34d806..2ec9e1ead127e9713facccb1f43549be017db07e 100644 (file)
@@ -2901,6 +2901,8 @@ int ieee80211_sta_activate_link(struct sta_info *sta, unsigned int link_id)
        if (!test_sta_flag(sta, WLAN_STA_INSERTED))
                goto hash;
 
+       ieee80211_recalc_min_chandef(sdata, link_id);
+
        /* Ensure the values are updated for the driver,
         * redone by sta_remove_link on failure.
         */