From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 28 Jan 2011 16:58:51 +0000 (+0000)
Subject: ath9k: merge fixes from r25204, r25205
X-Git-Tag: backfire_10.03.1~400
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=6fe3d9e1431fb1eb86d78fdc252ead55ba1552db;p=openwrt%2Fsvn-archive%2Fopenwrt.git

ath9k: merge fixes from r25204, r25205

SVN-Revision: 25206
---

diff --git a/package/mac80211/patches/540-ath9k_fix_queue_debug.patch b/package/mac80211/patches/540-ath9k_fix_queue_debug.patch
index f2d7846402..4dea506ae6 100644
--- a/package/mac80211/patches/540-ath9k_fix_queue_debug.patch
+++ b/package/mac80211/patches/540-ath9k_fix_queue_debug.patch
@@ -88,6 +88,16 @@
  void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs);
  
  #else
+@@ -192,7 +192,8 @@ static inline void ath_debug_stat_interr
+ 
+ static inline void ath_debug_stat_tx(struct ath_softc *sc,
+ 				     struct ath_buf *bf,
+-				     struct ath_tx_status *ts)
++				     struct ath_tx_status *ts,
++				     struct ath_txq *txq)
+ {
+ }
+ 
 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
 @@ -1913,7 +1913,7 @@ static void ath_tx_complete_buf(struct a
diff --git a/package/mac80211/patches/550-ath9k_optimize_memory_allocation.patch b/package/mac80211/patches/550-ath9k_optimize_memory_allocation.patch
index 8d3d62a83f..0ce3c00c25 100644
--- a/package/mac80211/patches/550-ath9k_optimize_memory_allocation.patch
+++ b/package/mac80211/patches/550-ath9k_optimize_memory_allocation.patch
@@ -30,7 +30,7 @@
  	sc->sc_flags &= ~SC_OP_RXFLUSH;
  	spin_lock_init(&sc->rx.rxbuflock);
  
-+	common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 + common->cachelsz +
++	common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 +
 +			     sc->sc_ah->caps.rx_status_len;
 +
  	if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {