Commit a2b28601 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville

ath9k: Remove unnecessary tbtt assignment

The next_tbtt variable in the scheduler is needed only
for GO/AP mode operation and is always read from the
NEXT_TBTT_TIMER in the HW. There is no need to store
the timestamp for received beacons.
Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4214852e
...@@ -454,7 +454,7 @@ void ath9k_p2p_ps_timer(void *priv); ...@@ -454,7 +454,7 @@ void ath9k_p2p_ps_timer(void *priv);
void ath9k_chanctx_wake_queues(struct ath_softc *sc); void ath9k_chanctx_wake_queues(struct ath_softc *sc);
void ath_chanctx_check_active(struct ath_softc *sc, struct ath_chanctx *ctx); void ath_chanctx_check_active(struct ath_softc *sc, struct ath_chanctx *ctx);
void ath_chanctx_beacon_recv_ev(struct ath_softc *sc, u32 ts, void ath_chanctx_beacon_recv_ev(struct ath_softc *sc,
enum ath_chanctx_event ev); enum ath_chanctx_event ev);
void ath_chanctx_beacon_sent_ev(struct ath_softc *sc, void ath_chanctx_beacon_sent_ev(struct ath_softc *sc,
enum ath_chanctx_event ev); enum ath_chanctx_event ev);
...@@ -483,7 +483,7 @@ static inline void ath9k_offchannel_init(struct ath_softc *sc) ...@@ -483,7 +483,7 @@ static inline void ath9k_offchannel_init(struct ath_softc *sc)
static inline void ath9k_deinit_channel_context(struct ath_softc *sc) static inline void ath9k_deinit_channel_context(struct ath_softc *sc)
{ {
} }
static inline void ath_chanctx_beacon_recv_ev(struct ath_softc *sc, u32 ts, static inline void ath_chanctx_beacon_recv_ev(struct ath_softc *sc,
enum ath_chanctx_event ev) enum ath_chanctx_event ev)
{ {
} }
......
...@@ -396,7 +396,6 @@ void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif, ...@@ -396,7 +396,6 @@ void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif,
break; break;
} }
/* /*
* Clear the extend_absence flag if it had been * Clear the extend_absence flag if it had been
* set during the previous beacon transmission, * set during the previous beacon transmission,
...@@ -416,6 +415,7 @@ void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif, ...@@ -416,6 +415,7 @@ void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif,
avp->noa_duration = 0; avp->noa_duration = 0;
sc->sched.extend_absence = true; sc->sched.extend_absence = true;
} }
/* Prevent wrap-around issues */ /* Prevent wrap-around issues */
if (avp->noa_duration && tsf_time - avp->noa_start > BIT(30)) if (avp->noa_duration && tsf_time - avp->noa_start > BIT(30))
avp->noa_duration = 0; avp->noa_duration = 0;
...@@ -606,10 +606,9 @@ void ath_chanctx_beacon_sent_ev(struct ath_softc *sc, ...@@ -606,10 +606,9 @@ void ath_chanctx_beacon_sent_ev(struct ath_softc *sc,
ath_chanctx_event(sc, NULL, ev); ath_chanctx_event(sc, NULL, ev);
} }
void ath_chanctx_beacon_recv_ev(struct ath_softc *sc, u32 ts, void ath_chanctx_beacon_recv_ev(struct ath_softc *sc,
enum ath_chanctx_event ev) enum ath_chanctx_event ev)
{ {
sc->sched.next_tbtt = ts;
ath_chanctx_event(sc, NULL, ev); ath_chanctx_event(sc, NULL, ev);
} }
......
...@@ -909,7 +909,7 @@ static int ath9k_rx_skb_preprocess(struct ath_softc *sc, ...@@ -909,7 +909,7 @@ static int ath9k_rx_skb_preprocess(struct ath_softc *sc,
if (ath9k_is_chanctx_enabled()) { if (ath9k_is_chanctx_enabled()) {
if (rx_stats->is_mybeacon) if (rx_stats->is_mybeacon)
ath_chanctx_beacon_recv_ev(sc, rx_stats->rs_tstamp, ath_chanctx_beacon_recv_ev(sc,
ATH_CHANCTX_EVENT_BEACON_RECEIVED); ATH_CHANCTX_EVENT_BEACON_RECEIVED);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment