diff options
| author | Oleksij Rempel | 2014-03-01 21:15:52 +0100 |
|---|---|---|
| committer | John W. Linville | 2014-03-17 18:13:06 +0100 |
| commit | cc24c86f7cc5de8938c32f15cd59bd425d21bb60 (patch) | |
| tree | 8c9de67ab668634ae38f3b1198498751240fc779 /drivers/net/wireless/ath/ath9k/htc_drv_main.c | |
| parent | ath9k: remove unused bc_tstamp (diff) | |
| download | kernel-qcow2-linux-cc24c86f7cc5de8938c32f15cd59bd425d21bb60.tar.gz kernel-qcow2-linux-cc24c86f7cc5de8938c32f15cd59bd425d21bb60.tar.xz kernel-qcow2-linux-cc24c86f7cc5de8938c32f15cd59bd425d21bb60.zip | |
ath9k_htc: sync beacon slot code with ath9k
we will need it for common-beacon
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/htc_drv_main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_main.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index b82a7c43eb6e..f46cd0250e48 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c @@ -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,11 +1576,21 @@ 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; - - ath9k_hw_init_global_settings(ah); + 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) |