diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-11-01 10:51:36 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-01 10:51:36 +0900 |
| commit | b34a264fabdce972ca8d1cff38d1b48ecb963719 (patch) | |
| tree | aa8b4ed66f545ec0ac4ae17803f3c8f95c1959cf /drivers/net/wireless/ath/ath10k/rx_desc.h | |
| parent | tc-testing: fix arg to ip command: -s -> -n (diff) | |
| parent | Merge ath-current from ath.git (diff) | |
| download | linux-rng-b34a264fabdce972ca8d1cff38d1b48ecb963719.tar.xz linux-rng-b34a264fabdce972ca8d1cff38d1b48ecb963719.zip | |
Merge tag 'wireless-drivers-for-davem-2017-10-31' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says:
====================
wireless-drivers fixes for 4.14
The most important here is the security vulnerabitility fix for
ath10k.
ath10k
* fix security vulnerability with missing PN check on certain hardware
* revert ath10k napi fix as it caused regressions on QCA6174
wcn36xx
* remove unnecessary rcu_read_unlock() from error path
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/rx_desc.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/rx_desc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath10k/rx_desc.h b/drivers/net/wireless/ath/ath10k/rx_desc.h index c1022a1cf855..28da14398951 100644 --- a/drivers/net/wireless/ath/ath10k/rx_desc.h +++ b/drivers/net/wireless/ath/ath10k/rx_desc.h @@ -239,6 +239,9 @@ enum htt_rx_mpdu_encrypt_type { HTT_RX_MPDU_ENCRYPT_WAPI = 5, HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2 = 6, HTT_RX_MPDU_ENCRYPT_NONE = 7, + HTT_RX_MPDU_ENCRYPT_AES_CCM256_WPA2 = 8, + HTT_RX_MPDU_ENCRYPT_AES_GCMP_WPA2 = 9, + HTT_RX_MPDU_ENCRYPT_AES_GCMP256_WPA2 = 10, }; #define RX_MPDU_START_INFO0_PEER_IDX_MASK 0x000007ff |