RISC-V: Add Sstc extension support

[linux-2.6-microblaze.git] / net / mac80211 / spectmgmt.c

diff --git a/net/mac80211/spectmgmt.c b/net/mac80211/spectmgmt.c
index 76747bf..871cdac 100644 (file)
--- a/net/mac80211/spectmgmt.c
+++ b/net/mac80211/spectmgmt.c
@@ -9,7 +9,7 @@
  * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
  * Copyright 2007-2008, Intel Corporation
  * Copyright 2008, Johannes Berg <johannes@sipsolutions.net>
- * Copyright (C) 2018, 2020 Intel Corporation
+ * Copyright (C) 2018, 2020, 2022 Intel Corporation
  */
 
 #include <linux/ieee80211.h>
@@ -23,7 +23,7 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata,
                                 struct ieee802_11_elems *elems,
                                 enum nl80211_band current_band,
                                 u32 vht_cap_info,
-                                u32 sta_flags, u8 *bssid,
+                                ieee80211_conn_flags_t conn_flags, u8 *bssid,
                                 struct ieee80211_csa_ie *csa_ie)
 {
        enum nl80211_band new_band = current_band;
@@ -40,13 +40,13 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata,
        sec_chan_offs = elems->sec_chan_offs;
        wide_bw_chansw_ie = elems->wide_bw_chansw_ie;
 
-       if (sta_flags & (IEEE80211_STA_DISABLE_HT |
-                        IEEE80211_STA_DISABLE_40MHZ)) {
+       if (conn_flags & (IEEE80211_CONN_DISABLE_HT |
+                         IEEE80211_CONN_DISABLE_40MHZ)) {
                sec_chan_offs = NULL;
                wide_bw_chansw_ie = NULL;
        }
 
-       if (sta_flags & IEEE80211_STA_DISABLE_VHT)
+       if (conn_flags & IEEE80211_CONN_DISABLE_VHT)
                wide_bw_chansw_ie = NULL;
 
        if (elems->ext_chansw_ie) {
@@ -93,7 +93,7 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata,
 
        if (sec_chan_offs) {
                secondary_channel_offset = sec_chan_offs->sec_chan_offs;
-       } else if (!(sta_flags & IEEE80211_STA_DISABLE_HT)) {
+       } else if (!(conn_flags & IEEE80211_CONN_DISABLE_HT)) {
                /* If the secondary channel offset IE is not present,
                 * we can't know what's the post-CSA offset, so the
                 * best we can do is use 20MHz.
@@ -160,10 +160,10 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata,
                                                &new_vht_chandef))
                        new_vht_chandef.chan = NULL;
 
-               if (sta_flags & IEEE80211_STA_DISABLE_80P80MHZ &&
+               if (conn_flags & IEEE80211_CONN_DISABLE_80P80MHZ &&
                    new_vht_chandef.width == NL80211_CHAN_WIDTH_80P80)
                        ieee80211_chandef_downgrade(&new_vht_chandef);
-               if (sta_flags & IEEE80211_STA_DISABLE_160MHZ &&
+               if (conn_flags & IEEE80211_CONN_DISABLE_160MHZ &&
                    new_vht_chandef.width == NL80211_CHAN_WIDTH_160)
                        ieee80211_chandef_downgrade(&new_vht_chandef);
        }