mac80211: update to version 5.9.1

[openwrt/staging/nbd.git] / package / kernel / mac80211 / patches / subsys / 110-mac80211_keep_keys_on_stop_ap.patch

diff --git a/package/kernel/mac80211/patches/subsys/110-mac80211_keep_keys_on_stop_ap.patch b/package/kernel/mac80211/patches/subsys/110-mac80211_keep_keys_on_stop_ap.patch
index 7bf99bec286674b54f886ea0d92d9528d3ae14db..c71f1f2ffcaf0a81bc54fa1c389670564161706f 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/110-mac80211_keep_keys_on_stop_ap.patch
+++ b/package/kernel/mac80211/patches/subsys/110-mac80211_keep_keys_on_stop_ap.patch
@@ -9,11 +9,16 @@ Used for AP+STA support in OpenWrt - preserve AP mode keys across STA reconnect
 
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -1635,7 +1635,6 @@ static int ieee80211_stop_ap(struct wiph
-       link_conf->bssid_indicator = 0;
+@@ -1647,12 +1647,6 @@ static int ieee80211_stop_ap(struct wiph
  
-       __sta_info_flush(sdata, true);
--      ieee80211_free_keys(sdata, true);
+       __sta_info_flush(sdata, true, link_id);
  
+-      ieee80211_remove_link_keys(link, &keys);
+-      if (!list_empty(&keys)) {
+-              synchronize_net();
+-              ieee80211_free_key_list(local, &keys);
+-      }
+-
        link_conf->enable_beacon = false;
        sdata->beacon_rate_set = false;
+       sdata->vif.cfg.ssid_len = 0;