diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2010-08-16 16:30:20 -0700 |
|---|---|---|
| committer | Luis R. Rodriguez <lrodriguez@atheros.com> | 2010-08-16 16:30:20 -0700 |
| commit | 4c0ceeee06c1c7eb2a1d14a2f9b5d51d606b428b (patch) | |
| tree | 91f18fe2a39d91e539647497627b74f36d853f30 /crap | |
| parent | c39a6e2df9982338a4f2ae63a21a9fe8b20cd873 (diff) | |
compat-wireless: refresh crap patches
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Diffstat (limited to 'crap')
| -rw-r--r-- | crap/0002-ath9k-Add-pktlog-support.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch index f1dad5ea..48a8daad 100644 --- a/crap/0002-ath9k-Add-pktlog-support.patch +++ b/crap/0002-ath9k-Add-pktlog-support.patch @@ -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 -@@ -2443,7 +2443,7 @@ void ath9k_hw_setrxfilter(struct ath_hw +@@ -2446,7 +2446,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 -@@ -601,7 +601,7 @@ struct ath_hw_ops { +@@ -607,7 +607,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, -@@ -830,6 +830,8 @@ struct ath_hw { +@@ -836,6 +836,8 @@ struct ath_hw { * this register when in sleep states. */ u32 WARegVal; @@ -1346,7 +1346,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> bf->bf_buf_addr = dma_map_single(sc->dev, requeue_skb->data, --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -448,6 +448,8 @@ static void ath_tx_complete_aggr(struct +@@ -431,6 +431,8 @@ static void ath_tx_complete_aggr(struct list_move_tail(&bf->list, &bf_head); } @@ -1355,7 +1355,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> if (!txpending) { /* * complete the acked-ones/xretried ones; update -@@ -2131,7 +2133,7 @@ static void ath_tx_processq(struct ath_s +@@ -2113,7 +2115,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; -@@ -2180,10 +2182,14 @@ static void ath_tx_processq(struct ath_s +@@ -2162,10 +2164,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 <vasanth@atheros.com> ath_wake_mac80211_queue(sc, txq); -@@ -2255,9 +2261,11 @@ void ath_tx_edma_tasklet(struct ath_soft +@@ -2237,9 +2243,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 <vasanth@atheros.com> if (status == -EINPROGRESS) break; if (status == -EIO) { -@@ -2309,14 +2317,18 @@ void ath_tx_edma_tasklet(struct ath_soft +@@ -2291,14 +2299,18 @@ void ath_tx_edma_tasklet(struct ath_soft ath_tx_rc_status(bf, &txs, 0, txok, true); } |