From 400f15b69f1a5beff058c7030caf0a92b95b0655 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 4 Jun 2010 14:54:46 -0700 Subject: [PATCH] compat-wireless: refresh of crap for 2010-06-04 Signed-off-by: Luis R. Rodriguez --- crap/0002-ath9k-Add-pktlog-support.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch index e0a0abd9e993..1e31f4d37240 100644 --- a/crap/0002-ath9k-Add-pktlog-support.patch +++ b/crap/0002-ath9k-Add-pktlog-support.patch @@ -105,7 +105,7 @@ Signed-off-by: Vasanthakumar Thiagarajan /* * Header for the ath9k.ko driver core *only* -- hw code nor any other driver -@@ -508,6 +509,7 @@ void ath_deinit_leds(struct ath_softc *s +@@ -511,6 +512,7 @@ void ath_deinit_leds(struct ath_softc *s #define SC_OP_TSF_RESET BIT(11) #define SC_OP_BT_PRIORITY_DETECTED BIT(12) #define SC_OP_BT_SCAN BIT(13) @@ -113,7 +113,7 @@ Signed-off-by: Vasanthakumar Thiagarajan /* Powersave flags */ #define PS_WAIT_FOR_BEACON BIT(0) -@@ -583,6 +585,10 @@ struct ath_softc { +@@ -586,6 +588,10 @@ struct ath_softc { #ifdef CONFIG_ATH9K_DEBUGFS struct ath9k_debug debug; #endif @@ -161,7 +161,7 @@ Signed-off-by: Vasanthakumar Thiagarajan static inline void ath9k_hw_set11n_txdesc(struct ath_hw *ah, void *ds, --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -2465,7 +2465,7 @@ void ath9k_hw_setrxfilter(struct ath_hw +@@ -2479,7 +2479,7 @@ void ath9k_hw_setrxfilter(struct ath_hw phybits |= AR_PHY_ERR_RADAR; if (bits & ATH9K_RX_FILTER_PHYERR) phybits |= AR_PHY_ERR_OFDM_TIMING | AR_PHY_ERR_CCK_TIMING; @@ -1355,7 +1355,7 @@ Signed-off-by: Vasanthakumar Thiagarajan if (!txpending) { /* * complete the acked-ones/xretried ones; update -@@ -2117,7 +2119,7 @@ static void ath_tx_processq(struct ath_s +@@ -2104,7 +2106,7 @@ static void ath_tx_processq(struct ath_s ds = lastbf->bf_desc; memset(&ts, 0, sizeof(ts)); @@ -1364,7 +1364,7 @@ Signed-off-by: Vasanthakumar Thiagarajan if (status == -EINPROGRESS) { spin_unlock_bh(&txq->axq_lock); break; -@@ -2167,10 +2169,14 @@ static void ath_tx_processq(struct ath_s +@@ -2154,10 +2156,14 @@ static void ath_tx_processq(struct ath_s ath_tx_rc_status(bf, &ts, 0, txok, true); } @@ -1381,7 +1381,7 @@ Signed-off-by: Vasanthakumar Thiagarajan ath_wake_mac80211_queue(sc, txq); -@@ -2242,9 +2248,11 @@ void ath_tx_edma_tasklet(struct ath_soft +@@ -2229,9 +2235,11 @@ void ath_tx_edma_tasklet(struct ath_soft struct list_head bf_head; int status; int txok; @@ -1394,7 +1394,7 @@ Signed-off-by: Vasanthakumar Thiagarajan if (status == -EINPROGRESS) break; if (status == -EIO) { -@@ -2297,14 +2305,18 @@ void ath_tx_edma_tasklet(struct ath_soft +@@ -2284,14 +2292,18 @@ void ath_tx_edma_tasklet(struct ath_soft ath_tx_rc_status(bf, &txs, 0, txok, true); } -- 2.30.2