mac80211: fix tx sequence number assignment with software queue + fast-xmit
PATCH 1/2 mac80211: fix tx sequence number assignment with software queue + fast-xmit
When using software queueing, tx sequence number assignment happens at ieee80211_tx_dequeue time, so the fast-xmit codepath must not do that.
--- net/mac80211/tx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/mac80211/tx.c +2 -1
@@ -2767,7 +2767,8 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata,if (hdr->frame_control &cpu_to_le16 (IEEE80211_STYPE_QOS_DATA )) { *ieee80211_get_qos_ctl (hdr) = tid; - hdr->seq_ctrl =ieee80211_tx_next_seq (sta, tid); +if (!sta->sta.txq[0 ]) + hdr->seq_ctrl =ieee80211_tx_next_seq (sta, tid); }else { info->flags |=IEEE80211_TX_CTL_ASSIGN_SEQ ; hdr->seq_ctrl =cpu_to_le16 (sdata->sequence_number);
Signature · 1 line
2.2.2
PATCH 2/2 mac80211: fix handling of PS filtering with fast-xmit
Fixes dropped packets in the tx path in case a non-PS station triggers the tx filter.
--- net/mac80211/status.c | 1 + net/mac80211/tx.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-)
net/mac80211/status.c +1 -0
@@ -101,6 +101,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,* when it wakes up for the next time. */ set_sta_flag (sta,WLAN_STA_CLEAR_PS_FILT ); +ieee80211_clear_fast_xmit (sta);/* * This code races in the following way:
net/mac80211/tx.c +5 -2
@@ -1218,8 +1218,10 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,if (!tx->sta) info->flags |=IEEE80211_TX_CTL_CLEAR_PS_FILT ; -else if (test_and_clear_sta_flag (tx->sta,WLAN_STA_CLEAR_PS_FILT )) +else if (test_and_clear_sta_flag (tx->sta,WLAN_STA_CLEAR_PS_FILT )) { info->flags |=IEEE80211_TX_CTL_CLEAR_PS_FILT ; +ieee80211_check_fast_xmit (tx->sta); + } info->flags |=IEEE80211_TX_CTL_FIRST_FRAGMENT ;
@@ -2451,7 +2453,8 @@ void ieee80211_check_fast_xmit(struct sta_info *sta)if (test_sta_flag (sta,WLAN_STA_PS_STA ) ||test_sta_flag (sta,WLAN_STA_PS_DRIVER ) || -test_sta_flag (sta,WLAN_STA_PS_DELIVER )) +test_sta_flag (sta,WLAN_STA_PS_DELIVER ) || +test_sta_flag (sta,WLAN_STA_CLEAR_PS_FILT )) goto out;if (sdata->noack_map)
Signature · 1 line
2.2.2
Re: [PATCH 4.3 2/2] mac80211: fix handling of PS filtering with fast-xmit
Quoted 4 lines · Felix Fietkau
Fixes dropped packets in the tx path in case a non-PS station triggers
the tx filter.
Applied, but without the stable tag since no driver in 4.2 that uses IEEE80211_TX_CTL_CLEAR_PS_FILT also had FAST_XMIT.
johannes
Quoted 5 lines · Felix Fietkau
When using software queueing, tx sequence number assignment happens at
ieee80211_tx_dequeuetime, so the fast-xmit codepath must not do that.
Applied, but to mac80211-next since there's no driver in 4.3 yet that actually uses ieee80211_tx_dequeue().
johannes