summaryrefslogtreecommitdiff
path: root/crap/0002-ath9k-Add-pktlog-support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'crap/0002-ath9k-Add-pktlog-support.patch')
-rw-r--r--crap/0002-ath9k-Add-pktlog-support.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch
index 7fcb5e67..7878ba8e 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 <vasanth@atheros.com>
/*
* Header for the ath9k.ko driver core *only* -- hw code nor any other driver
-@@ -546,6 +547,7 @@ struct ath_ant_comb {
+@@ -548,6 +549,7 @@ struct ath_ant_comb {
#define SC_OP_BT_SCAN BIT(13)
#define SC_OP_ANI_RUN BIT(14)
#define SC_OP_ENABLE_APM BIT(15)
@@ -113,7 +113,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
/* Powersave flags */
#define PS_WAIT_FOR_BEACON BIT(0)
-@@ -623,6 +625,10 @@ struct ath_softc {
+@@ -625,6 +627,10 @@ struct ath_softc {
#ifdef CONFIG_ATH9K_DEBUGFS
struct ath9k_debug debug;
#endif
@@ -161,7 +161,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
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
-@@ -2167,7 +2167,7 @@ void ath9k_hw_setrxfilter(struct ath_hw
+@@ -2148,7 +2148,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;
@@ -172,7 +172,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
REG_WRITE(ah, AR_RXCFG,
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -622,7 +622,7 @@ struct ath_hw_ops {
+@@ -617,7 +617,7 @@ struct ath_hw_ops {
const void *ds0, dma_addr_t buf_addr,
unsigned int qcu);
int (*proc_txdesc)(struct ath_hw *ah, void *ds,
@@ -181,7 +181,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
void (*set11n_txdesc)(struct ath_hw *ah, void *ds,
u32 pktLen, enum ath9k_pkt_type type,
u32 txPower, u32 keyIx,
-@@ -851,6 +851,8 @@ struct ath_hw {
+@@ -848,6 +848,8 @@ struct ath_hw {
/* Enterprise mode cap */
u32 ent_mode;
@@ -1355,7 +1355,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
if (!txpending || (tid->state & AGGR_CLEANUP)) {
/*
* complete the acked-ones/xretried ones; update
-@@ -2015,7 +2017,7 @@ static void ath_tx_processq(struct ath_s
+@@ -2018,7 +2020,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 <vasanth@atheros.com>
if (status == -EINPROGRESS) {
spin_unlock_bh(&txq->axq_lock);
break;
-@@ -2054,11 +2056,15 @@ static void ath_tx_processq(struct ath_s
+@@ -2057,11 +2059,15 @@ static void ath_tx_processq(struct ath_s
qnum = skb_get_queue_mapping(bf->bf_mpdu);
@@ -1382,7 +1382,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
if (txq == sc->tx.txq_map[qnum])
ath_wake_mac80211_queue(sc, qnum);
-@@ -2132,9 +2138,11 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2135,9 +2141,11 @@ void ath_tx_edma_tasklet(struct ath_soft
int status;
int txok;
int qnum;
@@ -1395,7 +1395,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
if (status == -EINPROGRESS)
break;
if (status == -EIO) {
-@@ -2177,16 +2185,20 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2180,16 +2188,20 @@ void ath_tx_edma_tasklet(struct ath_soft
qnum = skb_get_queue_mapping(bf->bf_mpdu);