mac80211: clear txflags for filtered/retried frames
RFC 1/1 mac80211: clear txflags for filtered/retried frames
This patch fixes stale mac80211_tx_control_flags for filtered / retried frames.
Because ieee80211_handle_filtered_frame injects the skbs back into the tx path, they have to be stripped of old tx flags which might confuse the stack or driver.
---
net/mac80211/status.c +9 -0
@@ -58,6 +58,15 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local, info->control.vif = &sta->sdata->vif; info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING |IEEE80211_TX_INTFL_RETRANSMISSION ; + info->flags &= ~(IEEE80211_TX_CTL_RATE_CTRL_PROBE | +IEEE80211_TX_CTL_PSPOLL_RESPONSE | +IEEE80211_TX_CTL_FIRST_FRAGMENT | +IEEE80211_TX_CTL_CLEAR_PS_FILT | +IEEE80211_TX_CTL_MORE_FRAMES | +IEEE80211_TX_CTL_AMPDU | +IEEE80211_TX_STAT_AMPDU_NO_BACK | +IEEE80211_TX_STAT_TX_FILTERED | +IEEE80211_TX_STAT_AMPDU ); sta->tx_filtered_count++;
Johannes Berg
maintainernet/mac80211/status.c static void ieee80211_handle_filtered_frame(struct ieee80211_local *local, · line 69
Quoted 11 lines · Christian Lamparter
net/mac80211/status.c +9
-0info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING |IEEE80211_TX_INTFL_RETRANSMISSION ; + info->flags &= ~(IEEE80211_TX_CTL_RATE_CTRL_PROBE | +IEEE80211_TX_CTL_PSPOLL_RESPONSE | +IEEE80211_TX_CTL_FIRST_FRAGMENT | +IEEE80211_TX_CTL_CLEAR_PS_FILT | +IEEE80211_TX_CTL_MORE_FRAMES | +IEEE80211_TX_CTL_AMPDU | +IEEE80211_TX_STAT_AMPDU_NO_BACK | +IEEE80211_TX_STAT_TX_FILTERED | +IEEE80211_TX_STAT_AMPDU );
Theo nly thing I wonder is if we should introduce some #define for the temporary flags here and put it into mac80211.h so we'll be less likely to forget updating it when adding new flags?
johannes
PATCH 1/1 mac80211: clear txflags for ps-filtered frames
This patch fixes stale mac80211_tx_control_flags for filtered / retried frames.
Because ieee80211_handle_filtered_frame injects the skbs back into the tx path, they have to be stripped of old tx flags so they won't confuse the stack, driver or device.
---
Quoted 8 lines · On Monday 20 September 2010 12:23:50 Johannes Berg wrote:
Review
Quoted 3 lines · Christian Lamparter
(quoted diff) +2
-0+ info->flags &= ~(IEEE80211_TX_CTL_RATE_CTRL_PROBE | + IEEE80211_TX_STAT_AMPDU);Theo nly thing I wonder is if we should introduce some #define for the temporary flags here and put it into
mac80211.hso we'll be less likely to forget updating it when adding new flags?
hmm, we are running out of bits.
Anyway, here is v1 (with define + doc). Not sure if this is sufficient.
---
include/net/mac80211.h +16 -0
@@ -321,6 +321,9 @@ struct ieee80211_bss_conf {* @IEEE80211_TX_CTL_LDPC: tells the driver to use LDPC for this frame * @IEEE80211_TX_CTL_STBC: Enables Space-Time Block Coding (STBC) for this * frame and selects the maximum number of streams that it can use. +* +* Note: If you have to add new flags to the enumeration, then don't +* forget to update %IEEE80211_TX_TEMPORARY_FLAGS when necessary. */ enum mac80211_tx_control_flags {IEEE80211_TX_CTL_REQ_TX_STATUS =BIT (0 ),
@@ -350,6 +353,19 @@ enum mac80211_tx_control_flags {#define IEEE80211_TX_CTL_STBC_SHIFT 23 +/* +* This definition is used as a mask to clear all temporary flags, which are +* set by the tx handlers for each transmission attempt by the mac80211 stack. +*/ +#define IEEE80211_TX_TEMPORARY_FLAGS (IEEE80211_TX_CTL_NO_ACK | \ + IEEE80211_TX_CTL_CLEAR_PS_FILT | IEEE80211_TX_CTL_FIRST_FRAGMENT | \ + IEEE80211_TX_CTL_SEND_AFTER_DTIM | IEEE80211_TX_CTL_AMPDU | \ + IEEE80211_TX_STAT_TX_FILTERED | IEEE80211_TX_STAT_ACK | \ + IEEE80211_TX_STAT_AMPDU | IEEE80211_TX_STAT_AMPDU_NO_BACK | \ + IEEE80211_TX_CTL_RATE_CTRL_PROBE | IEEE80211_TX_CTL_PSPOLL_RESPONSE | \ + IEEE80211_TX_CTL_MORE_FRAMES | IEEE80211_TX_CTL_LDPC | \ + IEEE80211_TX_CTL_STBC) +/** * enum mac80211_rate_control_flags - per-rate flags set by the * Rate Control algorithm.
net/mac80211/agg-rx.c +0 -2
@@ -129,9 +129,7 @@ static void sta_rx_agg_reorder_timer_expired(unsigned long data) timer_to_tid[0]);rcu_read_lock (); -spin_lock (&sta->lock);ieee80211_release_reorder_timeout (sta, *ptid); -spin_unlock (&sta->lock);rcu_read_unlock (); }
net/mac80211/status.c +1 -0
@@ -58,6 +58,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local, info->control.vif = &sta->sdata->vif; info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING |IEEE80211_TX_INTFL_RETRANSMISSION ; + info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS ; sta->tx_filtered_count++;
Johannes Berg
maintainerRe: [PATCH] mac80211: clear txflags for ps-filtered frames
net/mac80211/agg-rx.c static void sta_rx_agg_reorder_timer_expired(unsigned long data) · line 135
Quoted 12 lines · Christian Lamparter
net/mac80211/agg-rx.c +0
-2@@ -129,9 +129,7 @@ static void sta_rx_agg_reorder_timer_expired(unsigned long data) timer_to_tid[0]);rcu_read_lock (); -spin_lock (&sta->lock);ieee80211_release_reorder_timeout (sta, *ptid); -spin_unlock (&sta->lock);rcu_read_unlock (); }
Ack, apart from this?
johannes
PATCH v2 1/1 mac80211: clear txflags for ps-filtered frames
This patch fixes stale mac80211_tx_control_flags for filtered / retried frames.
Because ieee80211_handle_filtered_frame feeds skbs back into the tx path, they have to be stripped of some tx flags so they won't confuse the stack, driver or device.
---
Quoted 8 lines · On Tuesday 21 September 2010 08:33:32 Johannes Berg wrote:
net/mac80211/agg-rx.c static void sta_rx_agg_reorder_timer_expired(unsigned long data) · line 132
Quoted 7 lines · Christian Lamparter
net/mac80211/agg-rx.c +0
-2@@ -129,9 +129,7 @@ static void sta_rx_agg_reorder_timer_expired(unsigned long data)rcu_read_lock (); -spin_lock (&sta->lock);ieee80211_release_reorder_timeout (sta, *ptid); -spin_unlock (&sta->lock);
oops, indeed that part belongs to a different patch:
http://www.spinics.net/lists/linux-wireless/msg55107.html
---
include/net/mac80211.h +16 -0
@@ -321,6 +321,9 @@ struct ieee80211_bss_conf {* @IEEE80211_TX_CTL_LDPC: tells the driver to use LDPC for this frame * @IEEE80211_TX_CTL_STBC: Enables Space-Time Block Coding (STBC) for this * frame and selects the maximum number of streams that it can use. +* +* Note: If you have to add new flags to the enumeration, then don't +* forget to update %IEEE80211_TX_TEMPORARY_FLAGS when necessary. */ enum mac80211_tx_control_flags {IEEE80211_TX_CTL_REQ_TX_STATUS =BIT (0 ),
@@ -350,6 +353,19 @@ enum mac80211_tx_control_flags {#define IEEE80211_TX_CTL_STBC_SHIFT 23 +/* +* This definition is used as a mask to clear all temporary flags, which are +* set by the tx handlers for each transmission attempt by the mac80211 stack. +*/ +#define IEEE80211_TX_TEMPORARY_FLAGS (IEEE80211_TX_CTL_NO_ACK | \ + IEEE80211_TX_CTL_CLEAR_PS_FILT | IEEE80211_TX_CTL_FIRST_FRAGMENT | \ + IEEE80211_TX_CTL_SEND_AFTER_DTIM | IEEE80211_TX_CTL_AMPDU | \ + IEEE80211_TX_STAT_TX_FILTERED | IEEE80211_TX_STAT_ACK | \ + IEEE80211_TX_STAT_AMPDU | IEEE80211_TX_STAT_AMPDU_NO_BACK | \ + IEEE80211_TX_CTL_RATE_CTRL_PROBE | IEEE80211_TX_CTL_PSPOLL_RESPONSE | \ + IEEE80211_TX_CTL_MORE_FRAMES | IEEE80211_TX_CTL_LDPC | \ + IEEE80211_TX_CTL_STBC) +/** * enum mac80211_rate_control_flags - per-rate flags set by the * Rate Control algorithm.
net/mac80211/status.c +1 -0
@@ -58,6 +58,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local, info->control.vif = &sta->sdata->vif; info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING |IEEE80211_TX_INTFL_RETRANSMISSION ; + info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS ; sta->tx_filtered_count++;