ath5k: remove stale function declarations, make some functions static

[safe/jmp/linux-2.6] / drivers / net / wireless / ath / ath5k / qcu.c

diff --git a/drivers/net/wireless/ath/ath5k/qcu.c b/drivers/net/wireless/ath/ath5k/qcu.c
index e322a10..d9cab7c 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/qcu.c
+++ b/drivers/net/wireless/ath/ath5k/qcu.c
@@ -408,12 +408,13 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
                        break;
 
                case AR5K_TX_QUEUE_CAB:
+                       /* XXX: use BCN_SENT_GT, if we can figure out how */
                        AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_MISC(queue),
-                               AR5K_QCU_MISC_FRSHED_BCN_SENT_GT |
+                               AR5K_QCU_MISC_FRSHED_DBA_GT |
                                AR5K_QCU_MISC_CBREXP_DIS |
                                AR5K_QCU_MISC_CBREXP_BCN_DIS);
 
-                       ath5k_hw_reg_write(ah, ((AR5K_TUNE_BEACON_INTERVAL -
+                       ath5k_hw_reg_write(ah, ((tq->tqi_ready_time -
                                (AR5K_TUNE_SW_BEACON_RESP -
                                AR5K_TUNE_DMA_BEACON_RESP) -
                                AR5K_TUNE_ADDITIONAL_SWBA_BACKOFF) * 1024) |
@@ -515,6 +516,7 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
        return 0;
 }
 
+#if 0
 /*
  * Get slot time from DCU
  */
@@ -529,15 +531,16 @@ unsigned int ath5k_hw_get_slot_time(struct ath5k_hw *ah)
        else
                slot_time_clock = ath5k_hw_reg_read(ah, AR5K_DCU_GBL_IFS_SLOT);
 
-       return ath5k_hw_clocktoh(slot_time_clock & 0xffff, ah->ah_turbo);
+       return ath5k_hw_clocktoh(ah, slot_time_clock & 0xffff);
 }
+#endif
 
 /*
  * Set slot time on DCU
  */
 int ath5k_hw_set_slot_time(struct ath5k_hw *ah, unsigned int slot_time)
 {
-       u32 slot_time_clock = ath5k_hw_htoclock(slot_time, ah->ah_turbo);
+       u32 slot_time_clock = ath5k_hw_htoclock(ah, slot_time);
 
        ATH5K_TRACE(ah->ah_sc);