From fb72b8bb289d0302b318be03283e9933f3cab3a7 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 3 Oct 2014 01:33:28 +0200 Subject: [PATCH] Update OpenWrt --- modules | 2 +- ...duce-fw3-log-spam-in-netifd-scripts.patch} | 0 ...031-mac80211-add-another-ath9k-patch.patch | 73 ------------------- 3 files changed, 1 insertion(+), 74 deletions(-) rename patches/openwrt/{0032-Reduce-fw3-log-spam-in-netifd-scripts.patch => 0031-Reduce-fw3-log-spam-in-netifd-scripts.patch} (100%) delete mode 100644 patches/openwrt/0031-mac80211-add-another-ath9k-patch.patch diff --git a/modules b/modules index 922e4ff1..cdc47d72 100644 --- a/modules +++ b/modules @@ -1,7 +1,7 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/12.09/openwrt.git -OPENWRT_COMMIT=b0a05d4f7c194c7db43c3c5f1818449e4ecfe653 +OPENWRT_COMMIT=80c728365438d670bca4ed30251bfd00d773bae8 PACKAGES_OPENWRT_REPO=git://git.openwrt.org/12.09/packages.git PACKAGES_OPENWRT_COMMIT=381bbea65989b63e30f43ab87e51b042325bbff3 diff --git a/patches/openwrt/0032-Reduce-fw3-log-spam-in-netifd-scripts.patch b/patches/openwrt/0031-Reduce-fw3-log-spam-in-netifd-scripts.patch similarity index 100% rename from patches/openwrt/0032-Reduce-fw3-log-spam-in-netifd-scripts.patch rename to patches/openwrt/0031-Reduce-fw3-log-spam-in-netifd-scripts.patch diff --git a/patches/openwrt/0031-mac80211-add-another-ath9k-patch.patch b/patches/openwrt/0031-mac80211-add-another-ath9k-patch.patch deleted file mode 100644 index 0ffe111f..00000000 --- a/patches/openwrt/0031-mac80211-add-another-ath9k-patch.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Matthias Schiffer -Date: Thu, 24 Jul 2014 03:00:23 +0200 -Subject: mac80211: add another ath9k patch - -diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch -index ba05bde..6197e0e 100644 ---- a/package/mac80211/patches/300-pending_work.patch -+++ b/package/mac80211/patches/300-pending_work.patch -@@ -1,3 +1,21 @@ -+commit ff354dbdd743e5fe186df8cd17982db19f78231a -+Author: Felix Fietkau -+Date: Wed Jul 23 15:33:26 2014 +0200 -+ -+ ath9k: fix aggregation session lockup -+ -+ If an aggregation session fails, frames still end up in the driver queue -+ with IEEE80211_TX_CTL_AMPDU set. -+ This causes tx for the affected station/tid to stall, since -+ ath_tx_get_tid_subframe returning packets to send. -+ -+ Fix this by clearing IEEE80211_TX_CTL_AMPDU as long as no aggregation -+ session is running. -+ -+ Cc: stable@vger.kernel.org -+ Reported-by: Antonio Quartulli -+ Signed-off-by: Felix Fietkau -+ - commit 38695a6e5a940e6a524523b88a33916b016fb2a1 - Author: Felix Fietkau - Date: Fri Jul 11 12:06:18 2014 +0200 -@@ -2990,7 +3008,23 @@ Date: Mon May 19 21:20:49 2014 +0200 - if (WARN_ON(--txq->pending_frames < 0)) - txq->pending_frames = 0; - --@@ -1999,6 +1997,7 @@ static void setup_frame_info(struct ieee -+@@ -887,6 +885,15 @@ ath_tx_get_tid_subframe(struct ath_softc -+ -+ tx_info = IEEE80211_SKB_CB(skb); -+ tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT; -++ -++ /* -++ * No aggregation session is running, but there may be frames -++ * from a previous session or a failed attempt in the queue. -++ * Send them out as normal data frames -++ */ -++ if (!tid->active) -++ tx_info->flags &= ~IEEE80211_TX_CTL_AMPDU; -++ -+ if (!(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) { -+ bf->bf_state.bf_type = 0; -+ return bf; -+@@ -1999,6 +2006,7 @@ static void setup_frame_info(struct ieee - an = (struct ath_node *) sta->drv_priv; - - memset(fi, 0, sizeof(*fi)); -@@ -2998,7 +3032,7 @@ Date: Mon May 19 21:20:49 2014 +0200 - if (hw_key) - fi->keyix = hw_key->hw_key_idx; - else if (an && ieee80211_is_data(hdr->frame_control) && an->ps_key > 0) --@@ -2150,6 +2149,7 @@ int ath_tx_start(struct ieee80211_hw *hw -+@@ -2150,6 +2158,7 @@ int ath_tx_start(struct ieee80211_hw *hw - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); - struct ieee80211_sta *sta = txctl->sta; - struct ieee80211_vif *vif = info->control.vif; -@@ -3006,7 +3040,7 @@ Date: Mon May 19 21:20:49 2014 +0200 - struct ath_softc *sc = hw->priv; - struct ath_txq *txq = txctl->txq; - struct ath_atx_tid *tid = NULL; --@@ -2170,11 +2170,13 @@ int ath_tx_start(struct ieee80211_hw *hw -+@@ -2170,11 +2179,13 @@ int ath_tx_start(struct ieee80211_hw *hw - q = skb_get_queue_mapping(skb); - - ath_txq_lock(sc, txq);