3 files changed, 35 insertions, 2 deletions

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 9237ffb4e986..6c341d89448c 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1816,6 +1816,8 @@ void ieee80211_apply_vhtcap_overrides(struct ieee80211_sub_if_data *sdata,
                                       struct ieee80211_sta_vht_cap *vht_cap);
 void ieee80211_get_vht_mask_from_cap(__le16 vht_cap,
                                      u16 vht_mask[NL80211_VHT_NSS_MAX]);
+enum nl80211_chan_width
+ieee80211_sta_rx_bw_to_chan_width(struct sta_info *sta);
 
 /* Spectrum management */
 void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index f8c69acfda48..3a9f0c0a2de8 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2922,7 +2922,8 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
 
                         rx->sta->sta.bandwidth = new_bw;
                         sband = rx->local->hw.wiphy->bands[status->band];
-                        sta_opmode.bw = new_bw;
+                        sta_opmode.bw =
+                                ieee80211_sta_rx_bw_to_chan_width(rx->sta);
                         sta_opmode.changed = STA_OPMODE_MAX_BW_CHANGED;
 
                         rate_control_rate_update(local, sband, rx->sta,
diff --git a/net/mac80211/vht.c b/net/mac80211/vht.c
index 5714dee76b12..259325cbcc31 100644
--- a/net/mac80211/vht.c
+++ b/net/mac80211/vht.c
@@ -358,6 +358,36 @@ enum nl80211_chan_width ieee80211_sta_cap_chan_bw(struct sta_info *sta)
         return NL80211_CHAN_WIDTH_80;
 }
 
+enum nl80211_chan_width
+ieee80211_sta_rx_bw_to_chan_width(struct sta_info *sta)
+{
+        enum ieee80211_sta_rx_bandwidth cur_bw = sta->sta.bandwidth;
+        struct ieee80211_sta_vht_cap *vht_cap = &sta->sta.vht_cap;
+        u32 cap_width;
+
+        switch (cur_bw) {
+        case IEEE80211_STA_RX_BW_20:
+                if (!sta->sta.ht_cap.ht_supported)
+                        return NL80211_CHAN_WIDTH_20_NOHT;
+                else
+                        return NL80211_CHAN_WIDTH_20;
+        case IEEE80211_STA_RX_BW_40:
+                return NL80211_CHAN_WIDTH_40;
+        case IEEE80211_STA_RX_BW_80:
+                return NL80211_CHAN_WIDTH_80;
+        case IEEE80211_STA_RX_BW_160:
+                cap_width =
+                        vht_cap->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK;
+
+                if (cap_width == IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ)
+                        return NL80211_CHAN_WIDTH_160;
+
+                return NL80211_CHAN_WIDTH_80P80;
+        default:
+                return NL80211_CHAN_WIDTH_20;
+        }
+}
+
 enum ieee80211_sta_rx_bandwidth
 ieee80211_chan_width_to_rx_bw(enum nl80211_chan_width width)
 {
@@ -484,7 +514,7 @@ u32 __ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata,
         new_bw = ieee80211_sta_cur_vht_bw(sta);
         if (new_bw != sta->sta.bandwidth) {
                 sta->sta.bandwidth = new_bw;
-                sta_opmode.bw = new_bw;
+                sta_opmode.bw = ieee80211_sta_rx_bw_to_chan_width(sta);
                 changed |= IEEE80211_RC_BW_CHANGED;
                 sta_opmode.changed |= STA_OPMODE_MAX_BW_CHANGED;
         }