diff options
author | Hauke Mehrtens | 2010-11-17 15:52:53 -0600 |
---|---|---|
committer | Luis R. Rodriguez | 2010-11-18 01:44:40 -0600 |
commit | b131f3367e2be9997e40e4677f96e44847a1fb4d (patch) | |
tree | 0990f4c53b4907a606f0e4b1bafd5a839bf9c01e /crap | |
parent | 12f3be5485640192138f3c7423d04b682da59c11 (diff) | |
download | compat-wireless-b131f3367e2be9997e40e4677f96e44847a1fb4d.tar.gz compat-wireless-b131f3367e2be9997e40e4677f96e44847a1fb4d.tar.xz compat-wireless-b131f3367e2be9997e40e4677f96e44847a1fb4d.zip |
compat-wireless: make patches apply again
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'crap')
-rw-r--r-- | crap/0002-ath9k-Add-pktlog-support.patch | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch index 89b0074..775be74 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 | @@ -559,6 +560,7 @@ struct ath_ant_comb { | 108 | @@ -544,6 +545,7 @@ struct ath_ant_comb { |
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 | @@ -635,6 +637,10 @@ struct ath_softc { | 116 | @@ -621,6 +623,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 |
@@ -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 | @@ -2140,7 +2140,7 @@ void ath9k_hw_setrxfilter(struct ath_hw | 164 | @@ -2143,7 +2143,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 | @@ -580,7 +580,7 @@ struct ath_hw_ops { | 175 | @@ -616,7 +616,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,10 +181,10 @@ 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 | @@ -804,6 +804,8 @@ struct ath_hw { | 184 | @@ -845,6 +845,8 @@ struct ath_hw { |
185 | * this register when in sleep states. | 185 | |
186 | */ | 186 | /* Enterprise mode cap */ |
187 | u32 WARegVal; | 187 | u32 ent_mode; |
188 | + | 188 | + |
189 | + bool is_pkt_logging; | 189 | + bool is_pkt_logging; |
190 | }; | 190 | }; |
@@ -1298,7 +1298,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> | |||
1298 | } | 1298 | } |
1299 | 1299 | ||
1300 | static const | 1300 | static const |
1301 | @@ -1374,7 +1381,8 @@ static void ath_tx_status(void *priv, st | 1301 | @@ -1358,7 +1365,8 @@ static void ath_tx_status(void *priv, st |
1302 | tx_status = 1; | 1302 | tx_status = 1; |
1303 | 1303 | ||
1304 | ath_rc_tx_status(sc, ath_rc_priv, tx_info, final_ts_idx, tx_status, | 1304 | ath_rc_tx_status(sc, ath_rc_priv, tx_info, final_ts_idx, tx_status, |
@@ -1346,7 +1346,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> | |||
1346 | bf->bf_buf_addr = dma_map_single(sc->dev, requeue_skb->data, | 1346 | bf->bf_buf_addr = dma_map_single(sc->dev, requeue_skb->data, |
1347 | --- a/drivers/net/wireless/ath/ath9k/xmit.c | 1347 | --- a/drivers/net/wireless/ath/ath9k/xmit.c |
1348 | +++ b/drivers/net/wireless/ath/ath9k/xmit.c | 1348 | +++ b/drivers/net/wireless/ath/ath9k/xmit.c |
1349 | @@ -436,6 +436,8 @@ static void ath_tx_complete_aggr(struct | 1349 | @@ -476,6 +476,8 @@ static void ath_tx_complete_aggr(struct |
1350 | list_move_tail(&bf->list, &bf_head); | 1350 | list_move_tail(&bf->list, &bf_head); |
1351 | } | 1351 | } |
1352 | 1352 | ||
@@ -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 | @@ -2069,7 +2071,7 @@ static void ath_tx_processq(struct ath_s | 1358 | @@ -2004,7 +2006,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,13 +1364,14 @@ 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 | @@ -2108,10 +2110,14 @@ static void ath_tx_processq(struct ath_s | 1367 | @@ -2043,11 +2045,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 | ||
1371 | - if (bf_isampdu(bf)) | 1371 | - if (bf_isampdu(bf)) |
1372 | + if (bf_isampdu(bf)) { | 1372 | + if (bf_isampdu(bf)) { |
1373 | ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, txok); | 1373 | ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, txok, |
1374 | true); | ||
1374 | - else | 1375 | - else |
1375 | + } else { | 1376 | + } else { |
1376 | + ath9k_pktlog_txctrl(sc, &bf_head, lastbf); | 1377 | + ath9k_pktlog_txctrl(sc, &bf_head, lastbf); |
@@ -1381,7 +1382,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> | |||
1381 | 1382 | ||
1382 | if (txq == sc->tx.txq_map[qnum]) | 1383 | if (txq == sc->tx.txq_map[qnum]) |
1383 | ath_wake_mac80211_queue(sc, qnum); | 1384 | ath_wake_mac80211_queue(sc, qnum); |
1384 | @@ -2185,9 +2191,11 @@ void ath_tx_edma_tasklet(struct ath_soft | 1385 | @@ -2121,9 +2127,11 @@ void ath_tx_edma_tasklet(struct ath_soft |
1385 | int status; | 1386 | int status; |
1386 | int txok; | 1387 | int txok; |
1387 | int qnum; | 1388 | int qnum; |
@@ -1394,13 +1395,14 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> | |||
1394 | if (status == -EINPROGRESS) | 1395 | if (status == -EINPROGRESS) |
1395 | break; | 1396 | break; |
1396 | if (status == -EIO) { | 1397 | if (status == -EIO) { |
1397 | @@ -2230,15 +2238,19 @@ void ath_tx_edma_tasklet(struct ath_soft | 1398 | @@ -2166,16 +2174,20 @@ void ath_tx_edma_tasklet(struct ath_soft |
1398 | 1399 | ||
1399 | qnum = skb_get_queue_mapping(bf->bf_mpdu); | 1400 | qnum = skb_get_queue_mapping(bf->bf_mpdu); |
1400 | 1401 | ||
1401 | - if (bf_isampdu(bf)) | 1402 | - if (bf_isampdu(bf)) |
1402 | + if (bf_isampdu(bf)) { | 1403 | + if (bf_isampdu(bf)) { |
1403 | ath_tx_complete_aggr(sc, txq, bf, &bf_head, &txs, txok); | 1404 | ath_tx_complete_aggr(sc, txq, bf, &bf_head, &txs, |
1405 | txok, true); | ||
1404 | - else | 1406 | - else |
1405 | + } else { | 1407 | + } else { |
1406 | + ath9k_pktlog_txctrl(sc, &bf_head, lastbf); | 1408 | + ath9k_pktlog_txctrl(sc, &bf_head, lastbf); |