diff --git a/backports-3.12.8-1/drivers/net/wireless/ath/ath9k/ath9k.h b/backports-3.12.8-1/drivers/net/wireless/ath/ath9k/ath9k.h index b5900a0..e92c987 100755 --- a/backports-3.12.8-1/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/backports-3.12.8-1/drivers/net/wireless/ath/ath9k/ath9k.h @@ -123,14 +123,15 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd, /***********/ #define ATH_RXBUF 512 +#ifdef CPTCFG_ATH9K_TID_SLEEPING +#define ATH_TXBUF 1024 +#else #define ATH_TXBUF 512 +#endif #define ATH_TXBUF_RESERVE 5 -#ifdef CPTCFG_ATH9K_TID_SLEEPING -#define ATH_MAX_QDEPTH (ATH_TXBUF / 13 - ATH_TXBUF_RESERVE) -#else #define ATH_MAX_QDEPTH (ATH_TXBUF / 4 - ATH_TXBUF_RESERVE) -#endif + #define ATH_TXMAXTRY 13 @@ -666,11 +667,8 @@ void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs); #define ATH_REGCLASSIDS_MAX 10 #define ATH_CABQ_READY_TIME 80 /* % of beacon interval */ -#ifdef CPTCFG_ATH9K_TID_SLEEPING -#define ATH_MAX_SW_RETRIES 50 -#else #define ATH_MAX_SW_RETRIES 30 -#endif + #define ATH_CHAN_MAX 255 diff --git a/backports-3.12.8-1/drivers/net/wireless/ath/ath9k/xmit.c b/backports-3.12.8-1/drivers/net/wireless/ath/ath9k/xmit.c index ea8502f..73f949d 100755 --- a/backports-3.12.8-1/drivers/net/wireless/ath/ath9k/xmit.c +++ b/backports-3.12.8-1/drivers/net/wireless/ath/ath9k/xmit.c @@ -762,12 +762,8 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf, if (rates[i].flags & IEEE80211_TX_RC_SHORT_GI) modeidx++; - frmlen = sc->tx.max_aggr_framelen[q][modeidx][rates[i].idx]; -#ifdef CPTCFG_ATH9K_TID_SLEEPING - max_4ms_framelen = min(max_4ms_framelen/4, frmlen); -#else + frmlen = sc->tx.max_aggr_framelen[q][modeidx][rates[i].idx]; max_4ms_framelen = min(max_4ms_framelen, frmlen); -#endif } /* @@ -2360,6 +2356,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, !txq->stopped) { ieee80211_stop_queue(sc->hw, q); txq->stopped = true; + printk("TXQ STOPPED!!!! at ath_tx_start(): Maybe increase the buffer???? search for ATH_MAX_QDEPTH\n"); } if (info->flags & IEEE80211_TX_CTL_PS_RESPONSE) {