diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-26 04:18:26 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-26 04:18:26 +0300 |
| commit | 1a6da4fcdd02d5cb2c1deaec1a5cc2b06efd2a4d (patch) | |
| tree | c5133e472598e32052c2de95c1fd277191a527bf /include | |
| parent | 15c973858903009e995b2037683de29dfe968621 (diff) | |
| parent | 0bbab5f0301587cad4e923ccc49bb910db86162c (diff) | |
| download | linux-1a6da4fcdd02d5cb2c1deaec1a5cc2b06efd2a4d.tar.xz | |
Merge tag 'mac80211-for-net-2020-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A few changes:
* fix a debugfs vs. wiphy rename crash
* fix an invalid HE spec definition
* fix a mesh timer crash
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ieee80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 16268ef1cbcc..5d3e48d02033 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -2047,7 +2047,7 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info) } /* HE Operation defines */ -#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK 0x00000003 +#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK 0x00000007 #define IEEE80211_HE_OPERATION_TWT_REQUIRED 0x00000008 #define IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK 0x00003ff0 #define IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET 4 |