Changeset 41815


Ignore:
Timestamp:
2014-07-23T15:44:44+02:00 (4 years ago)
Author:
nbd
Message:

ath9k: fix a long standing aggregation related tx lockup

Signed-off-by: Felix Fietkau <nbd@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/mac80211/patches/300-pending_work.patch

    r41801 r41815  
     1commit ff354dbdd743e5fe186df8cd17982db19f78231a 
     2Author: Felix Fietkau <nbd@openwrt.org> 
     3Date:   Wed Jul 23 15:33:26 2014 +0200 
     4 
     5    ath9k: fix aggregation session lockup 
     6     
     7    If an aggregation session fails, frames still end up in the driver queue 
     8    with IEEE80211_TX_CTL_AMPDU set. 
     9    This causes tx for the affected station/tid to stall, since 
     10    ath_tx_get_tid_subframe returning packets to send. 
     11     
     12    Fix this by clearing IEEE80211_TX_CTL_AMPDU as long as no aggregation 
     13    session is running. 
     14     
     15    Cc: stable@vger.kernel.org 
     16    Reported-by: Antonio Quartulli <antonio@open-mesh.com> 
     17    Signed-off-by: Felix Fietkau <nbd@openwrt.org> 
     18 
    119commit 38695a6e5a940e6a524523b88a33916b016fb2a1 
    220Author: Felix Fietkau <nbd@openwrt.org> 
     
    29913009                txq->pending_frames = 0; 
    29923010  
    2993 @@ -1999,6 +1997,7 @@ static void setup_frame_info(struct ieee 
     3011@@ -887,6 +885,15 @@ ath_tx_get_tid_subframe(struct ath_softc 
     3012  
     3013                tx_info = IEEE80211_SKB_CB(skb); 
     3014                tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT; 
     3015+ 
     3016+               /* 
     3017+                * No aggregation session is running, but there may be frames 
     3018+                * from a previous session or a failed attempt in the queue. 
     3019+                * Send them out as normal data frames 
     3020+                */ 
     3021+               if (!tid->active) 
     3022+                       tx_info->flags &= ~IEEE80211_TX_CTL_AMPDU; 
     3023+ 
     3024                if (!(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) { 
     3025                        bf->bf_state.bf_type = 0; 
     3026                        return bf; 
     3027@@ -1999,6 +2006,7 @@ static void setup_frame_info(struct ieee 
    29943028                an = (struct ath_node *) sta->drv_priv; 
    29953029  
     
    29993033                fi->keyix = hw_key->hw_key_idx; 
    30003034        else if (an && ieee80211_is_data(hdr->frame_control) && an->ps_key > 0) 
    3001 @@ -2150,6 +2149,7 @@ int ath_tx_start(struct ieee80211_hw *hw 
     3035@@ -2150,6 +2158,7 @@ int ath_tx_start(struct ieee80211_hw *hw 
    30023036        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); 
    30033037        struct ieee80211_sta *sta = txctl->sta; 
     
    30073041        struct ath_txq *txq = txctl->txq; 
    30083042        struct ath_atx_tid *tid = NULL; 
    3009 @@ -2170,11 +2170,13 @@ int ath_tx_start(struct ieee80211_hw *hw 
     3043@@ -2170,11 +2179,13 @@ int ath_tx_start(struct ieee80211_hw *hw 
    30103044        q = skb_get_queue_mapping(skb); 
    30113045  
Note: See TracChangeset for help on using the changeset viewer.