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/ath5k | |
| parent | ce397d215ccd07b8ae3f71db689aedb85d56ab40 (diff) | |
| parent | d5e5f6855aab87dd54ff3a33c6a3ccdc9f97fbcc (diff) | |
| download | linux-4cf44d525548eaa49a65eeda2b87dfa76984fffb.tar.gz | |
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/ath5k')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/pcu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c index f23c851765df..05140d8baa36 100644 --- a/drivers/net/wireless/ath/ath5k/pcu.c +++ b/drivers/net/wireless/ath/ath5k/pcu.c @@ -670,6 +670,7 @@ ath5k_hw_init_beacon_timers(struct ath5k_hw *ah, u32 next_beacon, u32 interval) break; case NL80211_IFTYPE_ADHOC: AR5K_REG_ENABLE_BITS(ah, AR5K_TXCFG, AR5K_TXCFG_ADHOC_BCN_ATIM); + /* fall through */ default: /* On non-STA modes timer1 is used as next DMA * beacon alert (DBA) timer and timer2 as next |