aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-01-31 15:56:25 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-02-01 15:40:08 -0500
commit17ad353b8d9843731258b5d23556667b764939e9 (patch)
tree26c84253888ded3b008c7b1d8c29763646b673bf /include/net/mac80211.h
parent4754ffd68bc14de8db01451c49bb07adebe1e422 (diff)
mac80211: fix monitor mode tx radiotap header handling
When an injected frame gets buffered for a powersave STA or filtered and retransmitted, mac80211 attempts to parse the radiotap header again, which doesn't work because it's gone at that point. This patch adds a new flag for checking the availability of a radiotap header, so that it only attempts to parse it once, reusing the tx info on the next call to ieee80211_tx(). This fixes severe issues with rekeying in AP mode. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Cc: stable@kernel.org Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 1e9c93024cf..74ccf30fdf8 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -275,6 +275,8 @@ struct ieee80211_bss_conf {
275 * @IEEE80211_TX_INTFL_RETRANSMISSION: This frame is being retransmitted 275 * @IEEE80211_TX_INTFL_RETRANSMISSION: This frame is being retransmitted
276 * after TX status because the destination was asleep, it must not 276 * after TX status because the destination was asleep, it must not
277 * be modified again (no seqno assignment, crypto, etc.) 277 * be modified again (no seqno assignment, crypto, etc.)
278 * @IEEE80211_TX_INTFL_HAS_RADIOTAP: This frame was injected and still
279 * has a radiotap header at skb->data.
278 */ 280 */
279enum mac80211_tx_control_flags { 281enum mac80211_tx_control_flags {
280 IEEE80211_TX_CTL_REQ_TX_STATUS = BIT(0), 282 IEEE80211_TX_CTL_REQ_TX_STATUS = BIT(0),
@@ -296,6 +298,7 @@ enum mac80211_tx_control_flags {
296 IEEE80211_TX_CTL_PSPOLL_RESPONSE = BIT(17), 298 IEEE80211_TX_CTL_PSPOLL_RESPONSE = BIT(17),
297 IEEE80211_TX_CTL_MORE_FRAMES = BIT(18), 299 IEEE80211_TX_CTL_MORE_FRAMES = BIT(18),
298 IEEE80211_TX_INTFL_RETRANSMISSION = BIT(19), 300 IEEE80211_TX_INTFL_RETRANSMISSION = BIT(19),
301 IEEE80211_TX_INTFL_HAS_RADIOTAP = BIT(20),
299}; 302};
300 303
301/** 304/**