ath9k_htc: sync beacon slot code with ath9k (cc24c86f) · Commits · 戴 / test

drivers/net/wireless/ath/ath9k/htc.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -407,9 +407,17 @@ static inline void ath9k_htc_err_stat_rx(struct ath9k_htc_priv *priv,
		#define MIN_SWBA_RESPONSE 10 /* in TUs */

		struct htc_beacon {
		enum {
		OK, /* no change needed */
		UPDATE, /* update pending */
		COMMIT /* beacon sent, commit change */
		} updateslot; /* slot time update fsm */

		struct ieee80211_vif *bslot[ATH9K_HTC_MAX_BCN_VIF];
		u32 bmisscnt;
		u32 beaconq;
		int slottime;
		int slotupdate;
		};

		struct ath_btcoex {

+1 −0

Original line number	Diff line number	Diff line
		@@ -520,6 +520,7 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv,

		for (i = 0; i < ATH9K_HTC_MAX_BCN_VIF; i++)
		priv->beacon.bslot[i] = NULL;
		priv->beacon.slottime = ATH9K_SLOT_TIME_9;

		ath9k_cmn_init_channels_rates(common);
		ath9k_cmn_init_crypto(ah);

+15 −4

Original line number	Diff line number	Diff line
		@@ -1500,6 +1500,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
		struct ath9k_htc_priv *priv = hw->priv;
		struct ath_hw *ah = priv->ah;
		struct ath_common *common = ath9k_hw_common(ah);
		int slottime;

		mutex_lock(&priv->mutex);
		ath9k_htc_ps_wakeup(priv);
		@@ -1575,12 +1576,22 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,

		if (changed & BSS_CHANGED_ERP_SLOT) {
		if (bss_conf->use_short_slot)
		ah->slottime = 9;
		slottime = 9;
		else
		ah->slottime = 20;

		slottime = 20;
		if (vif->type == NL80211_IFTYPE_AP) {
		/*
		* Defer update, so that connected stations can adjust
		* their settings at the same time.
		* See beacon.c for more details
		*/
		priv->beacon.slottime = slottime;
		priv->beacon.updateslot = UPDATE;
		} else {
		ah->slottime = slottime;
		ath9k_hw_init_global_settings(ah);
		}
		}

		if (changed & BSS_CHANGED_HT)
		ath9k_htc_update_rate(priv, vif, bss_conf);