diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-04 20:33:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-04 20:33:29 +0100 |
| commit | 72deacce011bde7475c90e6ee7d4c7d28c384873 (patch) | |
| tree | 260ef0527ea13bb5f6b986bab3f1493e6879d8c1 /net/mac80211/ht.c | |
| parent | tg3: Add Macronix NVRAM support (diff) | |
| parent | mac80211: Fix setting TX power on monitor interfaces (diff) | |
| download | linux-72deacce011bde7475c90e6ee7d4c7d28c384873.tar.xz linux-72deacce011bde7475c90e6ee7d4c7d28c384873.zip | |
Merge tag 'mac80211-next-for-davem-2018-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
We have things all over the place, no point listing them.
One thing is notable: I applied two patches and later
reverted them - we'll get back to that once all the driver
situation is sorted out.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/ht.c')
| -rw-r--r-- | net/mac80211/ht.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index 1621b6ab17ba..d7523530d3f8 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c @@ -492,6 +492,7 @@ int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata, case IEEE80211_SMPS_AUTOMATIC: case IEEE80211_SMPS_NUM_MODES: WARN_ON(1); + /* fall through */ case IEEE80211_SMPS_OFF: action_frame->u.action.u.ht_smps.smps_control = WLAN_HT_SMPS_CONTROL_DISABLED; |