ath9k: merge fixes from r25204, r25205

[openwrt-10.03/.git] / package / mac80211 / patches / 540-ath9k_fix_queue_debug.patch

diff --git a/package/mac80211/patches/540-ath9k_fix_queue_debug.patch b/package/mac80211/patches/540-ath9k_fix_queue_debug.patch
index f2d784640295ba21340174cb34709cd844e86748..4dea506ae6c7b7631dcde1144a2d398fbe237a10 100644 (file)
--- 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