diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index b6663c80e7dd..1049773378f2 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1865,7 +1865,7 @@ static void ath9k_set_tsf(struct ieee80211_hw *hw,  	mutex_lock(&sc->mutex);  	ath9k_ps_wakeup(sc);  	tsf -= le64_to_cpu(avp->tsf_adjust); -	getrawmonotonic(&avp->chanctx->tsf_ts); +	ktime_get_raw_ts64(&avp->chanctx->tsf_ts);  	if (sc->cur_chan == avp->chanctx)  		ath9k_hw_settsf64(sc->sc_ah, tsf);  	avp->chanctx->tsf_val = tsf; @@ -1881,7 +1881,7 @@ static void ath9k_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)  	mutex_lock(&sc->mutex);  	ath9k_ps_wakeup(sc); -	getrawmonotonic(&avp->chanctx->tsf_ts); +	ktime_get_raw_ts64(&avp->chanctx->tsf_ts);  	if (sc->cur_chan == avp->chanctx)  		ath9k_hw_reset_tsf(sc->sc_ah);  	avp->chanctx->tsf_val = 0; @@ -1928,6 +1928,7 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,  	case IEEE80211_AMPDU_TX_STOP_FLUSH:  	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:  		flush = true; +		/* fall through */  	case IEEE80211_AMPDU_TX_STOP_CONT:  		ath9k_ps_wakeup(sc);  		ath_tx_aggr_stop(sc, sta, tid);  |