summaryrefslogtreecommitdiff
path: root/crap
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2010-07-08 13:13:02 -0700
committerLuis R. Rodriguez <lrodriguez@atheros.com>2010-07-08 13:13:02 -0700
commitd7a90d3e958b718d340c8230d736655331e3fc32 (patch)
tree7f87f5fc3598c0d0d617cebe896fc2cde126fd48 /crap
parentd46d0f91aca83e115f04f50f18d0882cc7b99d86 (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.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 b64715f0..6ef6907e 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
-@@ -517,6 +518,7 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -521,6 +522,7 @@ void ath_deinit_leds(struct ath_softc *s
#define SC_OP_BT_PRIORITY_DETECTED BIT(12)
#define SC_OP_BT_SCAN BIT(13)
#define SC_OP_ANI_RUN BIT(14)
@@ -113,7 +113,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
/* Powersave flags */
#define PS_WAIT_FOR_BEACON BIT(0)
-@@ -595,6 +597,10 @@ struct ath_softc {
+@@ -599,6 +601,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
-@@ -2417,7 +2417,7 @@ void ath9k_hw_setrxfilter(struct ath_hw
+@@ -2440,7 +2440,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;
@@ -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,
-@@ -826,6 +826,8 @@ struct ath_hw {
+@@ -831,6 +831,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
-@@ -418,6 +418,8 @@ static void ath_tx_complete_aggr(struct
+@@ -424,6 +424,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
-@@ -2094,7 +2096,7 @@ static void ath_tx_processq(struct ath_s
+@@ -2107,7 +2109,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;
-@@ -2144,10 +2146,14 @@ static void ath_tx_processq(struct ath_s
+@@ -2156,10 +2158,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);
-@@ -2219,9 +2225,11 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2231,9 +2237,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) {
-@@ -2274,14 +2282,18 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2285,14 +2293,18 @@ void ath_tx_edma_tasklet(struct ath_soft
ath_tx_rc_status(bf, &txs, 0, txok, true);
}