--- drivers/net/wireless/ath/ath5k/qcu.c

+++ drivers/net/wireless/ath/ath5k/qcu.c

@@ -408,12 +408,13 @@ int ath5k_hw_reset_tx_queue(struct ath5k

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) |