diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2018-11-09 17:15:25 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2018-11-09 17:15:25 +0200 |
| commit | bb38177cb6c6dc973ad8b88f219742b29f3002f1 (patch) | |
| tree | bbd4959418c9a0e6e8776b79c034c9798bb9fe56 /drivers/net/wireless/ath/carl9170/tx.c | |
| parent | 7d129adff3afbd3a449bc3593f2064ac546d58d3 (diff) | |
| parent | 55bb78d265c6bdebbe2fbfe2c7a30539f3b3412c (diff) | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for 4.21. Major changes:
ath10k
* add support for WCN3990 firmware crash recovery
* add firmware memory dump support for QCA4019
wil6210
* add firmware error recovery while in AP mode
ath9k
* remove experimental notice from dynack feature
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/tx.c')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/tx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c index 8c75651ede6c..2407931440ed 100644 --- a/drivers/net/wireless/ath/carl9170/tx.c +++ b/drivers/net/wireless/ath/carl9170/tx.c @@ -830,10 +830,12 @@ static bool carl9170_tx_rts_check(struct ar9170 *ar, case CARL9170_ERP_AUTO: if (ampdu) break; + /* fall through */ case CARL9170_ERP_MAC80211: if (!(rate->flags & IEEE80211_TX_RC_USE_RTS_CTS)) break; + /* fall through */ case CARL9170_ERP_RTS: if (likely(!multi)) @@ -854,6 +856,7 @@ static bool carl9170_tx_cts_check(struct ar9170 *ar, case CARL9170_ERP_MAC80211: if (!(rate->flags & IEEE80211_TX_RC_USE_CTS_PROTECT)) break; + /* fall through */ case CARL9170_ERP_CTS: return true; |