Merge branches 'acpi-misc' and 'acpi-video'

[linux.git] / net / mac80211 / mlme.c

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 379d2ab6d327881dc27b2662749aa54889709ca2..a99ad032530946fd8c5d82cfd799ba598284e10d 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -12,6 +12,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/fips.h>
 #include <linux/if_ether.h>
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
@@ -3155,6 +3156,19 @@ static bool ieee80211_twt_req_supported(const struct sta_info *sta,
                IEEE80211_HE_MAC_CAP0_TWT_RES;
 }
 
+static int ieee80211_recalc_twt_req(struct ieee80211_sub_if_data *sdata,
+                                   struct sta_info *sta,
+                                   struct ieee802_11_elems *elems)
+{
+       bool twt = ieee80211_twt_req_supported(sta, elems);
+
+       if (sdata->vif.bss_conf.twt_requester != twt) {
+               sdata->vif.bss_conf.twt_requester = twt;
+               return BSS_CHANGED_TWT;
+       }
+       return 0;
+}
+
 static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
                                    struct cfg80211_bss *cbss,
                                    struct ieee80211_mgmt *mgmt, size_t len)
@@ -3337,8 +3351,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
                                                  sta);
 
                bss_conf->he_support = sta->sta.he_cap.has_he;
-               bss_conf->twt_requester =
-                       ieee80211_twt_req_supported(sta, &elems);
+               changed |= ieee80211_recalc_twt_req(sdata, sta, &elems);
        } else {
                bss_conf->he_support = false;
                bss_conf->twt_requester = false;
@@ -3998,6 +4011,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
        mutex_lock(&local->sta_mtx);
        sta = sta_info_get(sdata, bssid);
 
+       changed |= ieee80211_recalc_twt_req(sdata, sta, &elems);
+
        if (ieee80211_config_bw(sdata, sta,
                                elems.ht_cap_elem, elems.ht_operation,
                                elems.vht_operation, elems.he_operation,
@@ -4948,7 +4963,12 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
                        basic_rates = BIT(min_rate_index);
                }
 
-               new_sta->sta.supp_rates[cbss->channel->band] = rates;
+               if (rates)
+                       new_sta->sta.supp_rates[cbss->channel->band] = rates;
+               else
+                       sdata_info(sdata,
+                                  "No rates found, keeping mandatory only\n");
+
                sdata->vif.bss_conf.basic_rates = basic_rates;
 
                /* cf. IEEE 802.11 9.2.12 */
@@ -5045,7 +5065,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
                auth_alg = WLAN_AUTH_OPEN;
                break;
        case NL80211_AUTHTYPE_SHARED_KEY:
-               if (IS_ERR(local->wep_tx_tfm))
+               if (fips_enabled)
                        return -EOPNOTSUPP;
                auth_alg = WLAN_AUTH_SHARED_KEY;
                break;