From: Vasanthakumar Thiagarajan Date: Tue, 18 May 2010 01:57:54 +0000 (-0700) Subject: ath9k: Make sure null func frame is acked before going into PS for ar9003 X-Git-Tag: firefly_0821_release~9833^2~1306^2~107^2~436 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=de0f648dc769daabd0842a8dcf439d5f1f23e07f;p=firefly-linux-kernel-4.4.55.git ath9k: Make sure null func frame is acked before going into PS for ar9003 Add missing code to handle nullfunc frame completion in ath_tx_edma_tasklet(). Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 859aa4ab0769..f63f6a944d62 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -2279,6 +2279,17 @@ 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)) { bf->bf_retries = txs.ts_longretry; if (txs.ts_status & ATH9K_TXERR_XRETRY)