aboutsummaryrefslogtreecommitdiffstats
path: root/crap
diff options
context:
space:
mode:
authorLuis R. Rodriguez2010-12-08 18:25:59 -0600
committerLuis R. Rodriguez2010-12-08 18:25:59 -0600
commit4a59d8a94d25ce16f3dd75b248aa23436e77fe07 (patch)
treef1eb138f303b8bb141b696e8354ffc22b1f68ebd /crap
parentb33e09606384669a896122501902512d6ef6922a (diff)
downloadcompat-wireless-4a59d8a94d25ce16f3dd75b248aa23436e77fe07.tar.gz
compat-wireless-4a59d8a94d25ce16f3dd75b248aa23436e77fe07.tar.xz
compat-wireless-4a59d8a94d25ce16f3dd75b248aa23436e77fe07.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.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch
index 14b7fdd..53c0bbe 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>
161 static inline void ath9k_hw_set11n_txdesc(struct ath_hw *ah, void *ds, 161 static inline void ath9k_hw_set11n_txdesc(struct ath_hw *ah, void *ds,
162--- a/drivers/net/wireless/ath/ath9k/hw.c 162--- a/drivers/net/wireless/ath/ath9k/hw.c
163+++ b/drivers/net/wireless/ath/ath9k/hw.c 163+++ b/drivers/net/wireless/ath/ath9k/hw.c
164@@ -2148,7 +2148,7 @@ void ath9k_hw_setrxfilter(struct ath_hw 164@@ -2160,7 +2160,7 @@ void ath9k_hw_setrxfilter(struct ath_hw
165 phybits |= AR_PHY_ERR_RADAR; 165 phybits |= AR_PHY_ERR_RADAR;
166 if (bits & ATH9K_RX_FILTER_PHYERR) 166 if (bits & ATH9K_RX_FILTER_PHYERR)
167 phybits |= AR_PHY_ERR_OFDM_TIMING | AR_PHY_ERR_CCK_TIMING; 167 phybits |= AR_PHY_ERR_OFDM_TIMING | AR_PHY_ERR_CCK_TIMING;
@@ -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@@ -617,7 +617,7 @@ struct ath_hw_ops { 175@@ -622,7 +622,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@@ -846,6 +846,8 @@ struct ath_hw { 184@@ -851,6 +851,8 @@ struct ath_hw {
185 185
186 /* Enterprise mode cap */ 186 /* Enterprise mode cap */
187 u32 ent_mode; 187 u32 ent_mode;
@@ -1310,15 +1310,15 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
1310 if (conf_is_ht(&sc->hw->conf) && 1310 if (conf_is_ht(&sc->hw->conf) &&
1311--- a/drivers/net/wireless/ath/ath9k/recv.c 1311--- a/drivers/net/wireless/ath/ath9k/recv.c
1312+++ b/drivers/net/wireless/ath/ath9k/recv.c 1312+++ b/drivers/net/wireless/ath/ath9k/recv.c
1313@@ -1617,6 +1617,7 @@ int ath_rx_tasklet(struct ath_softc *sc, 1313@@ -1619,6 +1619,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
1314 struct ieee80211_rx_status *rxs; 1314 struct ieee80211_rx_status *rxs;
1315 struct ath_hw *ah = sc->sc_ah; 1315 struct ath_hw *ah = sc->sc_ah;
1316 struct ath_common *common = ath9k_hw_common(ah); 1316 struct ath_common *common = ath9k_hw_common(ah);
1317+ u32 *rx_desc = NULL; 1317+ u32 *rx_desc = NULL;
1318 /* 1318 /*
1319 * The hw can techncically differ from common->hw when using ath9k 1319 * The hw can technically differ from common->hw when using ath9k
1320 * virtual wiphy so to account for that we iterate over the active 1320 * virtual wiphy so to account for that we iterate over the active
1321@@ -1709,12 +1710,24 @@ int ath_rx_tasklet(struct ath_softc *sc, 1321@@ -1711,12 +1712,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
1322 dma_type); 1322 dma_type);
1323 1323
1324 skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len); 1324 skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len);
@@ -1355,7 +1355,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
1355 if (!txpending || (tid->state & AGGR_CLEANUP)) { 1355 if (!txpending || (tid->state & AGGR_CLEANUP)) {
1356 /* 1356 /*
1357 * complete the acked-ones/xretried ones; update 1357 * complete the acked-ones/xretried ones; update
1358@@ -2025,7 +2027,7 @@ static void ath_tx_processq(struct ath_s 1358@@ -2019,7 +2021,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@@ -2064,11 +2066,15 @@ static void ath_tx_processq(struct ath_s 1367@@ -2058,11 +2060,15 @@ static void ath_tx_processq(struct ath_s
1368 1368
1369 qnum = skb_get_queue_mapping(bf->bf_mpdu); 1369 qnum = skb_get_queue_mapping(bf->bf_mpdu);
1370 1370
@@ -1382,7 +1382,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
1382 1382
1383 if (txq == sc->tx.txq_map[qnum]) 1383 if (txq == sc->tx.txq_map[qnum])
1384 ath_wake_mac80211_queue(sc, qnum); 1384 ath_wake_mac80211_queue(sc, qnum);
1385@@ -2142,9 +2148,11 @@ void ath_tx_edma_tasklet(struct ath_soft 1385@@ -2136,9 +2142,11 @@ void ath_tx_edma_tasklet(struct ath_soft
1386 int status; 1386 int status;
1387 int txok; 1387 int txok;
1388 int qnum; 1388 int qnum;
@@ -1395,7 +1395,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
1395 if (status == -EINPROGRESS) 1395 if (status == -EINPROGRESS)
1396 break; 1396 break;
1397 if (status == -EIO) { 1397 if (status == -EIO) {
1398@@ -2187,16 +2195,20 @@ void ath_tx_edma_tasklet(struct ath_soft 1398@@ -2181,16 +2189,20 @@ void ath_tx_edma_tasklet(struct ath_soft
1399 1399
1400 qnum = skb_get_queue_mapping(bf->bf_mpdu); 1400 qnum = skb_get_queue_mapping(bf->bf_mpdu);
1401 1401