diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-03-24 16:15:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-24 16:15:58 -0700 |
| commit | 5ef8c665416b9815113042e0edebe8ff66a45e2e (patch) | |
| tree | 2ebde986387cf2a1f20bb950bc71d71841f04fe8 /drivers/net/wireless/ath/ath11k/rx_desc.h | |
| parent | Merge branch 'PTP_CLK-pin-configuration-for-SJA1105-DSA-driver' (diff) | |
| parent | rtl8xxxu: Fix sparse warning: cast from restricted __le16 (diff) | |
| download | wireguard-linux-5ef8c665416b9815113042e0edebe8ff66a45e2e.tar.xz wireguard-linux-5ef8c665416b9815113042e0edebe8ff66a45e2e.zip | |
Merge tag 'wireless-drivers-next-2020-03-24' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for v5.7
Second set of patches for v5.7. Lots of cleanup patches this time, but
of course various new features as well fixes.
When merging with wireless-drivers this pull request has a conflict in:
drivers/net/wireless/intel/iwlwifi/pcie/drv.c
To solve that just drop the changes from commit cf52c8a776d1 in
wireless-drivers and take the hunk from wireless-drivers-next as is.
The list of specific subsystem device IDs are not necessary after
commit d6f2134a3831 (in wireless-drivers-next) anymore, the detection
is based on other characteristics of the devices.
Major changes:
qtnfmac
* support WPA3 SAE and OWE in AP mode
ath10k
* support for getting btcoex settings from Device Tree
* support QCA9377 SDIO device
ath11k
* add HE rate accounting
* add thermal sensor and cooling devices
mt76
* MT7663 support for the MT7615 driver
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ath/ath11k/rx_desc.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath11k/rx_desc.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath11k/rx_desc.h b/drivers/net/wireless/ath/ath11k/rx_desc.h index a5aff801f17f..4d586fd1f872 100644 --- a/drivers/net/wireless/ath/ath11k/rx_desc.h +++ b/drivers/net/wireless/ath/ath11k/rx_desc.h @@ -1209,4 +1209,12 @@ struct hal_rx_desc { u8 msdu_payload[0]; } __packed; +#define HAL_RX_RU_ALLOC_TYPE_MAX 6 +#define RU_26 1 +#define RU_52 2 +#define RU_106 4 +#define RU_242 9 +#define RU_484 18 +#define RU_996 37 + #endif /* ATH11K_RX_DESC_H */ |