* [RFC] mac80211: clear txflags for filtered/retried frames @ 2010-09-18 19:33 Christian Lamparter 2010-09-20 10:23 ` Johannes Berg 0 siblings, 1 reply; 5+ messages in thread From: Christian Lamparter @ 2010-09-18 19:33 UTC (permalink / raw) To: linux-wireless; +Cc: Johannes Berg 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. --- diff --git a/net/mac80211/status.c b/net/mac80211/status.c index 571b32b..17d98a2 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -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++; ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [RFC] mac80211: clear txflags for filtered/retried frames 2010-09-18 19:33 [RFC] mac80211: clear txflags for filtered/retried frames Christian Lamparter @ 2010-09-20 10:23 ` Johannes Berg 2010-09-20 22:22 ` [PATCH] mac80211: clear txflags for ps-filtered frames Christian Lamparter 0 siblings, 1 reply; 5+ messages in thread From: Johannes Berg @ 2010-09-20 10:23 UTC (permalink / raw) To: Christian Lamparter; +Cc: linux-wireless On Sat, 2010-09-18 at 21:33 +0200, Christian Lamparter wrote: > 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); 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] mac80211: clear txflags for ps-filtered frames 2010-09-20 10:23 ` Johannes Berg @ 2010-09-20 22:22 ` Christian Lamparter 2010-09-21 6:33 ` Johannes Berg 0 siblings, 1 reply; 5+ messages in thread From: Christian Lamparter @ 2010-09-20 22:22 UTC (permalink / raw) To: Johannes Berg; +Cc: linux-wireless, John W. Linville 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. Cc: <stable@kernel.org> Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> --- On Monday 20 September 2010 12:23:50 Johannes Berg wrote: > On Sat, 2010-09-18 at 21:33 +0200, Christian Lamparter wrote: > > + 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.h so 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. --- diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 12a49f0..5d1187d 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -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. diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c index 58eab9e..309ed70 100644 --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c @@ -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(); } diff --git a/net/mac80211/status.c b/net/mac80211/status.c index 571b32b..dd85006 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -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++; ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] mac80211: clear txflags for ps-filtered frames 2010-09-20 22:22 ` [PATCH] mac80211: clear txflags for ps-filtered frames Christian Lamparter @ 2010-09-21 6:33 ` Johannes Berg 2010-09-21 19:36 ` [PATCH v2] " Christian Lamparter 0 siblings, 1 reply; 5+ messages in thread From: Johannes Berg @ 2010-09-21 6:33 UTC (permalink / raw) To: Christian Lamparter; +Cc: linux-wireless, John W. Linville On Tue, 2010-09-21 at 00:22 +0200, Christian Lamparter wrote: > --- a/net/mac80211/agg-rx.c > +++ b/net/mac80211/agg-rx.c > @@ -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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] mac80211: clear txflags for ps-filtered frames 2010-09-21 6:33 ` Johannes Berg @ 2010-09-21 19:36 ` Christian Lamparter 0 siblings, 0 replies; 5+ messages in thread From: Christian Lamparter @ 2010-09-21 19:36 UTC (permalink / raw) To: linux-wireless; +Cc: John W. Linville 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. Cc: <stable@kernel.org> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> --- On Tuesday 21 September 2010 08:33:32 Johannes Berg wrote: > On Tue, 2010-09-21 at 00:22 +0200, Christian Lamparter wrote: > > --- a/net/mac80211/agg-rx.c > > +++ b/net/mac80211/agg-rx.c > > @@ -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 --- diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 12a49f0..5d1187d 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -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. diff --git a/net/mac80211/status.c b/net/mac80211/status.c index 571b32b..dd85006 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -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++; ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-09-21 19:36 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-09-18 19:33 [RFC] mac80211: clear txflags for filtered/retried frames Christian Lamparter 2010-09-20 10:23 ` Johannes Berg 2010-09-20 22:22 ` [PATCH] mac80211: clear txflags for ps-filtered frames Christian Lamparter 2010-09-21 6:33 ` Johannes Berg 2010-09-21 19:36 ` [PATCH v2] " Christian Lamparter
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).