Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next

[cascardo/linux.git] / net / mac80211 / vht.c

diff --git a/net/mac80211/vht.c b/net/mac80211/vht.c
index bc9e8fc..85f9596 100644 (file)
--- a/net/mac80211/vht.c
+++ b/net/mac80211/vht.c
@@ -269,51 +269,54 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata,
        sta->sta.bandwidth = ieee80211_sta_cur_vht_bw(sta);
 }
 
-enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta)
+enum ieee80211_sta_rx_bandwidth ieee80211_sta_cap_rx_bw(struct sta_info *sta)
 {
-       struct ieee80211_sub_if_data *sdata = sta->sdata;
-       u32 cap = sta->sta.vht_cap.cap;
-       enum ieee80211_sta_rx_bandwidth bw;
+       struct ieee80211_sta_vht_cap *vht_cap = &sta->sta.vht_cap;
+       u32 cap_width;
 
-       if (!sta->sta.vht_cap.vht_supported) {
-               bw = sta->sta.ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 ?
-                               IEEE80211_STA_RX_BW_40 : IEEE80211_STA_RX_BW_20;
-               goto check_max;
-       }
+       if (!vht_cap->vht_supported)
+               return sta->sta.ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 ?
+                               IEEE80211_STA_RX_BW_40 :
+                               IEEE80211_STA_RX_BW_20;
 
-       switch (sdata->vif.bss_conf.chandef.width) {
-       default:
-               WARN_ON_ONCE(1);
-               /* fall through */
+       cap_width = vht_cap->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK;
+
+       if (cap_width == IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ ||
+           cap_width == IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ)
+               return IEEE80211_STA_RX_BW_160;
+
+       return IEEE80211_STA_RX_BW_80;
+}
+
+static enum ieee80211_sta_rx_bandwidth
+ieee80211_chan_width_to_rx_bw(enum nl80211_chan_width width)
+{
+       switch (width) {
        case NL80211_CHAN_WIDTH_20_NOHT:
        case NL80211_CHAN_WIDTH_20:
-               bw = IEEE80211_STA_RX_BW_20;
-               break;
+               return IEEE80211_STA_RX_BW_20;
        case NL80211_CHAN_WIDTH_40:
-               bw = sta->sta.ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 ?
-                               IEEE80211_STA_RX_BW_40 : IEEE80211_STA_RX_BW_20;
-               break;
+               return IEEE80211_STA_RX_BW_40;
+       case NL80211_CHAN_WIDTH_80:
+               return IEEE80211_STA_RX_BW_80;
        case NL80211_CHAN_WIDTH_160:
-               if ((cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) ==
-                               IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ) {
-                       bw = IEEE80211_STA_RX_BW_160;
-                       break;
-               }
-               /* fall through */
        case NL80211_CHAN_WIDTH_80P80:
-               if ((cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) ==
-                               IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ) {
-                       bw = IEEE80211_STA_RX_BW_160;
-                       break;
-               }
-               /* fall through */
-       case NL80211_CHAN_WIDTH_80:
-               bw = IEEE80211_STA_RX_BW_80;
+               return IEEE80211_STA_RX_BW_160;
+       default:
+               WARN_ON_ONCE(1);
+               return IEEE80211_STA_RX_BW_20;
        }
+}
+
+enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta)
+{
+       struct ieee80211_sub_if_data *sdata = sta->sdata;
+       enum ieee80211_sta_rx_bandwidth bw;
+
+       bw = ieee80211_chan_width_to_rx_bw(sdata->vif.bss_conf.chandef.width);
+       bw = min(bw, ieee80211_sta_cap_rx_bw(sta));
+       bw = min(bw, sta->cur_max_bandwidth);
 
- check_max:
-       if (bw > sta->cur_max_bandwidth)
-               bw = sta->cur_max_bandwidth;
        return bw;
 }