diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-29 16:23:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-29 16:23:26 -0400 |
| commit | e15f20ea33b8e5074145abe464b4b48acea505d9 (patch) | |
| tree | ad173bb9facf7b0673a2cc313c2d52778b8f18ff /net/mac80211/ht.c | |
| parent | e3e67a4f07433d0159dcbd2abe7d6bdf6e1268c8 (diff) | |
| parent | c470bdc1aaf36669e04ba65faf1092b2d1c6cabe (diff) | |
| download | linux-stable-e15f20ea33b8e5074145abe464b4b48acea505d9.tar.gz linux-stable-e15f20ea33b8e5074145abe464b4b48acea505d9.tar.bz2 linux-stable-e15f20ea33b8e5074145abe464b4b48acea505d9.zip | |
Merge tag 'mac80211-next-for-davem-2018-03-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
We have a fair number of patches, but many of them are from the
first bullet here:
* EAPoL-over-nl80211 from Denis - this will let us fix
some long-standing issues with bridging, races with
encryption and more
* DFS offload support from the qtnfmac folks
* regulatory database changes for the new ETSI adaptivity
requirements
* various other fixes and small enhancements
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/ht.c')
| -rw-r--r-- | net/mac80211/ht.c | 15 |
1 files changed, 15 insertions, 0 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) |