diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-12 20:56:56 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-12 20:56:56 +0300 |
| commit | e32cf9a386236523be005a66dbee7cdcb5148b4d (patch) | |
| tree | 5853bdd81c7d74e7a3081464bb78525c37484dd8 /include/linux | |
| parent | 9163a0fc1f0c0980f117cc25f4fa6ba9b0750a36 (diff) | |
| parent | f8252e7b5a83deee0e477fc1e31e3f06ceb35d28 (diff) | |
| download | linux-e32cf9a386236523be005a66dbee7cdcb5148b4d.tar.xz | |
Merge tag 'mac80211-next-for-davem-2018-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Highlights:
* merge net-next, so I can finish the hwsim workqueue removal
* fix TXQ NULL pointer issue that was reported multiple times
* minstrel cleanups from Felix
* simplify lib80211 code by not using skcipher, note that this
will conflict with the crypto tree (and this new code here
should be used)
* use new netlink policy validation in nl80211
* fix up SAE (part of WPA3) in client-mode
* FTM responder support in the stack
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ieee80211.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index c4809ad8ab46..0ef67f837ae1 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -1670,6 +1670,7 @@ struct ieee80211_mu_edca_param_set { #define IEEE80211_VHT_CAP_RXSTBC_3 0x00000300 #define IEEE80211_VHT_CAP_RXSTBC_4 0x00000400 #define IEEE80211_VHT_CAP_RXSTBC_MASK 0x00000700 +#define IEEE80211_VHT_CAP_RXSTBC_SHIFT 8 #define IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE 0x00000800 #define IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE 0x00001000 #define IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT 13 |