diff options
author | Kalle Valo <kvalo@codeaurora.org> | 2018-06-18 16:48:15 +0300 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2018-06-18 16:48:15 +0300 |
commit | 4cf44d525548eaa49a65eeda2b87dfa76984fffb (patch) | |
tree | 9ba7c4bb7cc6023e6549d71ca83a5f8a7e56961d /drivers/net/wireless/ath/ath9k/main.c | |
parent | ce397d215ccd07b8ae3f71db689aedb85d56ab40 (diff) | |
parent | d5e5f6855aab87dd54ff3a33c6a3ccdc9f97fbcc (diff) | |
download | linux-4cf44d525548eaa49a65eeda2b87dfa76984fffb.tar.xz |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for 4.19. Major changes:
ath10k
* support channel 173
* fix spectral scan for QCA9984 and QCA9888 chipsets
ath6kl
* add support for Dell Wireless 1537
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index b6663c80e7dd..5eb1c0aea41d 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1928,6 +1928,7 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw, case IEEE80211_AMPDU_TX_STOP_FLUSH: case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT: flush = true; + /* fall through */ case IEEE80211_AMPDU_TX_STOP_CONT: ath9k_ps_wakeup(sc); ath_tx_aggr_stop(sc, sta, tid); |