ath9k: remove unnecessary power save flag and cleanup to code.
PATCH 1/1 ath9k: remove unnecessary power save flag and cleanup to code.
drv_config callback is called only after the ack for the nullframe is received and so driver need not do anything special for this.
So remove NULLFUNC_COMPLETED, PS_ENABLED flags and bf_isnullfunc flags from ath9k as mac80211 already handles them properly.
Also modularize the power save config callback.
--- drivers/net/wireless/ath/ath9k/ath9k.h | 4 -- drivers/net/wireless/ath/ath9k/main.c | 56 ++++++++++++++----------------- drivers/net/wireless/ath/ath9k/xmit.c | 30 ----------------- 3 files changed, 25 insertions(+), 65 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +0 -4
@@ -241,7 +241,6 @@ struct ath_buf {dma_addr_t bf_daddr;/* physical addr of desc */ dma_addr_t bf_buf_addr;/* physical addr of data buffer */ bool bf_stale; -bool bf_isnullfunc;bool bf_tx_aborted;u16 bf_flags;struct ath_buf_state bf_state;
@@ -349,7 +348,6 @@ int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid, u16 *ssn);void ath_tx_aggr_stop (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid);void ath_tx_aggr_resume (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid); -void ath9k_enable_ps (struct ath_softc *sc);/********/ /* VIFs */
@@ -573,8 +571,6 @@ struct ath_ant_comb {#define PS_WAIT_FOR_PSPOLL_DATA BIT(2)#define PS_WAIT_FOR_TX_ACK BIT(3)#define PS_BEACON_SYNC BIT(4) -#define PS_NULLFUNC_COMPLETED BIT(5) -#define PS_ENABLED BIT(6)struct ath_wiphy ;struct ath_rate_table ;
drivers/net/wireless/ath/ath9k/main.c +25 -31
80 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/xmit.c +0 -30
@@ -1648,13 +1648,6 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf, bf->bf_buf_addr = bf->bf_dmacontext; -/* tag if this is a nullfunc frame to enable PS when AP acks it */ -if (ieee80211_is_nullfunc (fc) &&ieee80211_has_pm (fc)) { - bf->bf_isnullfunc = true; - sc->ps_flags &= ~PS_NULLFUNC_COMPLETED ; - }else - bf->bf_isnullfunc = false; - bf->bf_tx_aborted = false;return 0 ;
@@ -2082,18 +2075,6 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) }/* -* We now know the nullfunc frame has been ACKed so we -* can disable RX. -*/ -if (bf->bf_isnullfunc && - (ts.ts_status &ATH9K_TX_ACKED )) { -if ((sc->ps_flags &PS_ENABLED )) -ath9k_enable_ps (sc); -else - sc->ps_flags |=PS_NULLFUNC_COMPLETED ; - } - -/* * Remove ath_buf's of the same transmit unit from txq, * however leave the last descriptor back as the holding * descriptor for hw.
@@ -2236,17 +2217,6 @@ void ath_tx_edma_tasklet(struct ath_softc *sc) txok = !(txs.ts_status &ATH9K_TXERR_MASK ); -/* -* Make sure null func frame is acked before configuring -* hw into ps mode. -*/ -if (bf->bf_isnullfunc && txok) { -if ((sc->ps_flags &PS_ENABLED )) -ath9k_enable_ps (sc); -else - sc->ps_flags |=PS_NULLFUNC_COMPLETED ; - } -if (!bf_isampdu (bf)) {if (txs.ts_status &ATH9K_TXERR_XRETRY ) bf->bf_state.bf_type |=BUF_XRETRY ;
--
1.7.2.1
Quoted 9 lines · Senthil Balasubramanian
drv_configcallback is called only after the ack for the nullframe is received and so driver need not do anything special for this.So remove
NULLFUNC_COMPLETED,PS_ENABLEDflags andbf_isnullfuncflags from ath9k as mac80211 already handles them properly.Also modularize the power save config callback.
Signed-off-by Senthil Balasubramanian <[email protected]>
Senthil can you split these up into two separate patches?
Luis