From c34f065d00896772ecc41b1ac1889eb245fd1685 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 6 Aug 2013 10:30:58 +0000 Subject: ath9k: add some more fixes for the tx queueing rework Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37713 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../kernel/mac80211/patches/572-ath9k_multicast_node.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'package/kernel/mac80211/patches/572-ath9k_multicast_node.patch') diff --git a/package/kernel/mac80211/patches/572-ath9k_multicast_node.patch b/package/kernel/mac80211/patches/572-ath9k_multicast_node.patch index cbe3816b12..28ec6ee9db 100644 --- a/package/kernel/mac80211/patches/572-ath9k_multicast_node.patch +++ b/package/kernel/mac80211/patches/572-ath9k_multicast_node.patch @@ -69,7 +69,7 @@ ieee80211_send_bar(tid->an->vif, tid->an->sta->addr, tid->tidno, seqno << IEEE80211_SEQ_SEQ_SHIFT); } -@@ -1352,7 +1355,7 @@ static bool ath_tx_sched_aggr(struct ath +@@ -1354,7 +1357,7 @@ static bool ath_tx_sched_aggr(struct ath if (list_empty(&bf_q)) return false; @@ -78,16 +78,16 @@ tid->ac->clear_ps_filter = false; tx_info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; } -@@ -1542,7 +1545,7 @@ void ath9k_release_buffered_frames(struc +@@ -1544,7 +1547,7 @@ void ath9k_release_buffered_frames(struc sent++; TX_STAT_INC(txq->axq_qnum, a_queued_hw); -- if (ath_tid_has_buffered(tid)) -+ if (an->sta && ath_tid_has_buffered(tid)) +- if (!ath_tid_has_buffered(tid)) ++ if (an->sta && !ath_tid_has_buffered(tid)) ieee80211_sta_set_buffered(an->sta, i, false); } ath_txq_unlock_complete(sc, tid->ac->txq); -@@ -2075,6 +2078,7 @@ static int ath_tx_prepare(struct ieee802 +@@ -2076,6 +2079,7 @@ static int ath_tx_prepare(struct ieee802 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_sta *sta = txctl->sta; struct ieee80211_vif *vif = info->control.vif; @@ -95,7 +95,7 @@ struct ath_softc *sc = hw->priv; int frmlen = skb->len + FCS_LEN; int padpos, padsize; -@@ -2082,6 +2086,10 @@ static int ath_tx_prepare(struct ieee802 +@@ -2083,6 +2087,10 @@ static int ath_tx_prepare(struct ieee802 /* NOTE: sta can be NULL according to net/mac80211.h */ if (sta) txctl->an = (struct ath_node *)sta->drv_priv; -- cgit v1.2.3