diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-04-10 12:32:14 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-12 16:59:14 -0400 |
commit | fe12081cb664cd5d412dc56de0585a80484b1331 (patch) | |
tree | 8fa6f7a2261db0fd655a5b04e6c19303a31127da | |
parent | c5e0a88aa2e0f42cdb4c79c977c52f6bc38ec160 (diff) |
ath5k: remove ts_rate from ath5k_tx_status
It is no longer necessary for preparing mac80211 tx status
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath5k/ath5k.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath5k/desc.c | 13 |
2 files changed, 0 insertions, 14 deletions
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h index 4bb381cae08d..aa588a0521c1 100644 --- a/drivers/net/wireless/ath/ath5k/ath5k.h +++ b/drivers/net/wireless/ath/ath5k/ath5k.h | |||
@@ -452,7 +452,6 @@ struct ath5k_tx_status { | |||
452 | u16 ts_seqnum; | 452 | u16 ts_seqnum; |
453 | u16 ts_tstamp; | 453 | u16 ts_tstamp; |
454 | u8 ts_status; | 454 | u8 ts_status; |
455 | u8 ts_rate[4]; | ||
456 | u8 ts_retry[4]; | 455 | u8 ts_retry[4]; |
457 | u8 ts_final_idx; | 456 | u8 ts_final_idx; |
458 | s8 ts_rssi; | 457 | s8 ts_rssi; |
diff --git a/drivers/net/wireless/ath/ath5k/desc.c b/drivers/net/wireless/ath/ath5k/desc.c index 0a8a9efaf8b4..990a3b421443 100644 --- a/drivers/net/wireless/ath/ath5k/desc.c +++ b/drivers/net/wireless/ath/ath5k/desc.c | |||
@@ -375,8 +375,6 @@ static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah, | |||
375 | AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH); | 375 | AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH); |
376 | ts->ts_antenna = 1; | 376 | ts->ts_antenna = 1; |
377 | ts->ts_status = 0; | 377 | ts->ts_status = 0; |
378 | ts->ts_rate[0] = AR5K_REG_MS(tx_ctl->tx_control_0, | ||
379 | AR5K_2W_TX_DESC_CTL0_XMIT_RATE); | ||
380 | ts->ts_retry[0] = ts->ts_longretry; | 378 | ts->ts_retry[0] = ts->ts_longretry; |
381 | ts->ts_final_idx = 0; | 379 | ts->ts_final_idx = 0; |
382 | 380 | ||
@@ -439,32 +437,21 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah, | |||
439 | ts->ts_retry[ts->ts_final_idx] = ts->ts_longretry; | 437 | ts->ts_retry[ts->ts_final_idx] = ts->ts_longretry; |
440 | switch (ts->ts_final_idx) { | 438 | switch (ts->ts_final_idx) { |
441 | case 3: | 439 | case 3: |
442 | ts->ts_rate[3] = AR5K_REG_MS(tx_ctl->tx_control_3, | ||
443 | AR5K_4W_TX_DESC_CTL3_XMIT_RATE3); | ||
444 | |||
445 | ts->ts_retry[2] = AR5K_REG_MS(tx_ctl->tx_control_2, | 440 | ts->ts_retry[2] = AR5K_REG_MS(tx_ctl->tx_control_2, |
446 | AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2); | 441 | AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2); |
447 | ts->ts_longretry += ts->ts_retry[2]; | 442 | ts->ts_longretry += ts->ts_retry[2]; |
448 | /* fall through */ | 443 | /* fall through */ |
449 | case 2: | 444 | case 2: |
450 | ts->ts_rate[2] = AR5K_REG_MS(tx_ctl->tx_control_3, | ||
451 | AR5K_4W_TX_DESC_CTL3_XMIT_RATE2); | ||
452 | |||
453 | ts->ts_retry[1] = AR5K_REG_MS(tx_ctl->tx_control_2, | 445 | ts->ts_retry[1] = AR5K_REG_MS(tx_ctl->tx_control_2, |
454 | AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1); | 446 | AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1); |
455 | ts->ts_longretry += ts->ts_retry[1]; | 447 | ts->ts_longretry += ts->ts_retry[1]; |
456 | /* fall through */ | 448 | /* fall through */ |
457 | case 1: | 449 | case 1: |
458 | ts->ts_rate[1] = AR5K_REG_MS(tx_ctl->tx_control_3, | ||
459 | AR5K_4W_TX_DESC_CTL3_XMIT_RATE1); | ||
460 | |||
461 | ts->ts_retry[0] = AR5K_REG_MS(tx_ctl->tx_control_2, | 450 | ts->ts_retry[0] = AR5K_REG_MS(tx_ctl->tx_control_2, |
462 | AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1); | 451 | AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1); |
463 | ts->ts_longretry += ts->ts_retry[0]; | 452 | ts->ts_longretry += ts->ts_retry[0]; |
464 | /* fall through */ | 453 | /* fall through */ |
465 | case 0: | 454 | case 0: |
466 | ts->ts_rate[0] = tx_ctl->tx_control_3 & | ||
467 | AR5K_4W_TX_DESC_CTL3_XMIT_RATE0; | ||
468 | break; | 455 | break; |
469 | } | 456 | } |
470 | 457 | ||