From 83cc2deba9a07c5fc3bee9c8c973721bc374d734 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 11 Dec 2010 01:45:12 +0000 Subject: mac80211: update to 2010-12-09 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24471 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../mac80211/patches/530-ath9k_tid_seq_fix.patch | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 package/mac80211/patches/530-ath9k_tid_seq_fix.patch (limited to 'package/mac80211/patches/530-ath9k_tid_seq_fix.patch') diff --git a/package/mac80211/patches/530-ath9k_tid_seq_fix.patch b/package/mac80211/patches/530-ath9k_tid_seq_fix.patch deleted file mode 100644 index cb65aa847..000000000 --- a/package/mac80211/patches/530-ath9k_tid_seq_fix.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/xmit.c -+++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -1689,17 +1689,20 @@ static void ath_tx_start_dma(struct ath_ - struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; - struct list_head bf_head; -- struct ath_atx_tid *tid; -+ struct ath_atx_tid *tid = NULL; - u8 tidno; - - spin_lock_bh(&txctl->txq->axq_lock); - -- if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && txctl->an) { -+ if (ieee80211_is_data_qos(hdr->frame_control) && txctl->an) { - tidno = ieee80211_get_qos_ctl(hdr)[0] & - IEEE80211_QOS_CTL_TID_MASK; - tid = ATH_AN_2_TID(txctl->an, tidno); - - WARN_ON(tid->ac->txq != txctl->txq); -+ } -+ -+ if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && tid) { - /* - * Try aggregation if it's a unicast data frame - * and the destination is HT capable. -@@ -1716,7 +1719,7 @@ static void ath_tx_start_dma(struct ath_ - ar9003_hw_set_paprd_txdesc(sc->sc_ah, bf->bf_desc, - bf->bf_state.bfs_paprd); - -- ath_tx_send_normal(sc, txctl->txq, NULL, &bf_head); -+ ath_tx_send_normal(sc, txctl->txq, tid, &bf_head); - } - - spin_unlock_bh(&txctl->txq->axq_lock); -- cgit v1.2.3