diff options
author | Luis R. Rodriguez | 2010-08-23 19:08:37 -0500 |
---|---|---|
committer | Luis R. Rodriguez | 2010-08-23 19:08:37 -0500 |
commit | 1d39e2de3f056ff7e751f7dd4f87be52411421d1 (patch) | |
tree | adb6afd1eca84a07169077f1e2b75817d3b35f39 /crap | |
parent | 6d335d53682000e8d0ba0326021e03d489aac337 (diff) | |
download | compat-wireless-1d39e2de3f056ff7e751f7dd4f87be52411421d1.tar.gz compat-wireless-1d39e2de3f056ff7e751f7dd4f87be52411421d1.tar.xz compat-wireless-1d39e2de3f056ff7e751f7dd4f87be52411421d1.zip |
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 48a8daa..d8e4b68 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> | |||
105 | 105 | ||
106 | /* | 106 | /* |
107 | * Header for the ath9k.ko driver core *only* -- hw code nor any other driver | 107 | * Header for the ath9k.ko driver core *only* -- hw code nor any other driver |
108 | @@ -521,6 +522,7 @@ void ath_deinit_leds(struct ath_softc *s | 108 | @@ -514,6 +515,7 @@ void ath_deinit_leds(struct ath_softc *s |
109 | #define SC_OP_BT_PRIORITY_DETECTED BIT(12) | 109 | #define SC_OP_BT_PRIORITY_DETECTED BIT(12) |
110 | #define SC_OP_BT_SCAN BIT(13) | 110 | #define SC_OP_BT_SCAN BIT(13) |
111 | #define SC_OP_ANI_RUN BIT(14) | 111 | #define SC_OP_ANI_RUN BIT(14) |
@@ -113,7 +113,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> | |||
113 | 113 | ||
114 | /* Powersave flags */ | 114 | /* Powersave flags */ |
115 | #define PS_WAIT_FOR_BEACON BIT(0) | 115 | #define PS_WAIT_FOR_BEACON BIT(0) |
116 | @@ -599,6 +601,10 @@ struct ath_softc { | 116 | @@ -592,6 +594,10 @@ struct ath_softc { |
117 | #ifdef CONFIG_ATH9K_DEBUGFS | 117 | #ifdef CONFIG_ATH9K_DEBUGFS |
118 | struct ath9k_debug debug; | 118 | struct ath9k_debug debug; |
119 | #endif | 119 | #endif |
@@ -172,7 +172,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> | |||
172 | REG_WRITE(ah, AR_RXCFG, | 172 | REG_WRITE(ah, AR_RXCFG, |
173 | --- a/drivers/net/wireless/ath/ath9k/hw.h | 173 | --- a/drivers/net/wireless/ath/ath9k/hw.h |
174 | +++ b/drivers/net/wireless/ath/ath9k/hw.h | 174 | +++ b/drivers/net/wireless/ath/ath9k/hw.h |
175 | @@ -607,7 +607,7 @@ struct ath_hw_ops { | 175 | @@ -608,7 +608,7 @@ struct ath_hw_ops { |
176 | const void *ds0, dma_addr_t buf_addr, | 176 | const void *ds0, dma_addr_t buf_addr, |
177 | unsigned int qcu); | 177 | unsigned int qcu); |
178 | int (*proc_txdesc)(struct ath_hw *ah, void *ds, | 178 | int (*proc_txdesc)(struct ath_hw *ah, void *ds, |
@@ -181,7 +181,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> | |||
181 | void (*set11n_txdesc)(struct ath_hw *ah, void *ds, | 181 | void (*set11n_txdesc)(struct ath_hw *ah, void *ds, |
182 | u32 pktLen, enum ath9k_pkt_type type, | 182 | u32 pktLen, enum ath9k_pkt_type type, |
183 | u32 txPower, u32 keyIx, | 183 | u32 txPower, u32 keyIx, |
184 | @@ -836,6 +836,8 @@ struct ath_hw { | 184 | @@ -837,6 +837,8 @@ struct ath_hw { |
185 | * this register when in sleep states. | 185 | * this register when in sleep states. |
186 | */ | 186 | */ |
187 | u32 WARegVal; | 187 | u32 WARegVal; |
@@ -1355,7 +1355,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> | |||
1355 | if (!txpending) { | 1355 | if (!txpending) { |
1356 | /* | 1356 | /* |
1357 | * complete the acked-ones/xretried ones; update | 1357 | * complete the acked-ones/xretried ones; update |
1358 | @@ -2113,7 +2115,7 @@ static void ath_tx_processq(struct ath_s | 1358 | @@ -2097,7 +2099,7 @@ static void ath_tx_processq(struct ath_s |
1359 | ds = lastbf->bf_desc; | 1359 | ds = lastbf->bf_desc; |
1360 | 1360 | ||
1361 | memset(&ts, 0, sizeof(ts)); | 1361 | memset(&ts, 0, sizeof(ts)); |
@@ -1364,7 +1364,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> | |||
1364 | if (status == -EINPROGRESS) { | 1364 | if (status == -EINPROGRESS) { |
1365 | spin_unlock_bh(&txq->axq_lock); | 1365 | spin_unlock_bh(&txq->axq_lock); |
1366 | break; | 1366 | break; |
1367 | @@ -2162,10 +2164,14 @@ static void ath_tx_processq(struct ath_s | 1367 | @@ -2146,10 +2148,14 @@ static void ath_tx_processq(struct ath_s |
1368 | ath_tx_rc_status(bf, &ts, 0, txok, true); | 1368 | ath_tx_rc_status(bf, &ts, 0, txok, true); |
1369 | } | 1369 | } |
1370 | 1370 | ||
@@ -1381,7 +1381,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> | |||
1381 | 1381 | ||
1382 | ath_wake_mac80211_queue(sc, txq); | 1382 | ath_wake_mac80211_queue(sc, txq); |
1383 | 1383 | ||
1384 | @@ -2237,9 +2243,11 @@ void ath_tx_edma_tasklet(struct ath_soft | 1384 | @@ -2221,9 +2227,11 @@ void ath_tx_edma_tasklet(struct ath_soft |
1385 | struct list_head bf_head; | 1385 | struct list_head bf_head; |
1386 | int status; | 1386 | int status; |
1387 | int txok; | 1387 | int txok; |
@@ -1394,7 +1394,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> | |||
1394 | if (status == -EINPROGRESS) | 1394 | if (status == -EINPROGRESS) |
1395 | break; | 1395 | break; |
1396 | if (status == -EIO) { | 1396 | if (status == -EIO) { |
1397 | @@ -2291,14 +2299,18 @@ void ath_tx_edma_tasklet(struct ath_soft | 1397 | @@ -2275,14 +2283,18 @@ void ath_tx_edma_tasklet(struct ath_soft |
1398 | ath_tx_rc_status(bf, &txs, 0, txok, true); | 1398 | ath_tx_rc_status(bf, &txs, 0, txok, true); |
1399 | } | 1399 | } |
1400 | 1400 | ||