diff options
author | Felix Fietkau <nbd@nbd.name> | 2018-02-10 13:20:34 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-30 07:47:34 +0200 |
commit | d7680ddc5abb801eeb67b707518b50e363635be6 (patch) | |
tree | ff36cd3bcf67a550a7159b45e541313f61037e84 | |
parent | 39e221cb5ce0822cd7d0a4c82e8949d32f33e43e (diff) | |
download | linux-stable-d7680ddc5abb801eeb67b707518b50e363635be6.tar.gz linux-stable-d7680ddc5abb801eeb67b707518b50e363635be6.tar.bz2 linux-stable-d7680ddc5abb801eeb67b707518b50e363635be6.zip |
mac80211: round IEEE80211_TX_STATUS_HEADROOM up to multiple of 4
[ Upstream commit 651b9920d7a694ffb1f885aef2bbb068a25d9d66 ]
This ensures that mac80211 allocated management frames are properly
aligned, which makes copying them more efficient.
For instance, mt76 uses iowrite32_copy to copy beacon frames to beacon
template memory on the chip.
Misaligned 32-bit accesses cause CPU exceptions on MIPS and should be
avoided.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | include/net/mac80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index a9de1da73c01..0335c5d932a7 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -3368,7 +3368,7 @@ static inline int ieee80211_sta_ps_transition_ni(struct ieee80211_sta *sta, * The TX headroom reserved by mac80211 for its own tx_status functions. * This is enough for the radiotap header. */ -#define IEEE80211_TX_STATUS_HEADROOM 14 +#define IEEE80211_TX_STATUS_HEADROOM ALIGN(14, 4) /** * ieee80211_sta_set_buffered - inform mac80211 about driver-buffered frames |