3 files changed, 19 insertions, 1 deletions

diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index d7523530d3f8..c78036a0ac94 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -466,6 +466,21 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
                 __ieee80211_stop_tx_ba_session(sta, tid, AGG_STOP_PEER_REQUEST);
 }
 
+enum nl80211_smps_mode
+ieee80211_smps_mode_to_smps_mode(enum ieee80211_smps_mode smps)
+{
+        switch (smps) {
+        case IEEE80211_SMPS_OFF:
+                return NL80211_SMPS_OFF;
+        case IEEE80211_SMPS_STATIC:
+                return NL80211_SMPS_STATIC;
+        case IEEE80211_SMPS_DYNAMIC:
+                return NL80211_SMPS_DYNAMIC;
+        default:
+                return NL80211_SMPS_OFF;
+        }
+}
+
 int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata,
                                enum ieee80211_smps_mode smps, const u8 *da,
                                const u8 *bssid)
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index ae9c33cd8ada..9237ffb4e986 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1788,6 +1788,8 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid);
 void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid);
 
 u8 ieee80211_mcs_to_chains(const struct ieee80211_mcs_info *mcs);
+enum nl80211_smps_mode
+ieee80211_smps_mode_to_smps_mode(enum ieee80211_smps_mode smps);
 
 /* VHT */
 void
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 27bb1f0b5e52..f8c69acfda48 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2883,7 +2883,8 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
                         if (rx->sta->sta.smps_mode == smps_mode)
                                 goto handled;
                         rx->sta->sta.smps_mode = smps_mode;
-                        sta_opmode.smps_mode = smps_mode;
+                        sta_opmode.smps_mode =
+                                ieee80211_smps_mode_to_smps_mode(smps_mode);
                         sta_opmode.changed = STA_OPMODE_SMPS_MODE_CHANGED;
 
                         sband = rx->local->hw.wiphy->bands[status->band];