summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-08 23:13:39 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-02-12 16:52:25 +0100
commit739e42f4f3fc5906db049b54e45498c7ab5bba81 (patch)
tree848965e3ed4cfc3505955aee23b7ab3b8b7b1419 /drivers/net/wireless/iwlwifi
parent9b26b5002937850846046a99de8c6065ff86fa6d (diff)
downloadblackbird-op-linux-739e42f4f3fc5906db049b54e45498c7ab5bba81.tar.gz
blackbird-op-linux-739e42f4f3fc5906db049b54e45498c7ab5bba81.zip
iwlwifi: dvm: apply beacon changes immediately
If the AP/GO beacon changes, apply such a change immediately, otherwise the AP/GO beacon can be stale for a long time. Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/rxon.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c
index 9fabd26997ca..23be948cf162 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
@@ -1545,10 +1545,9 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
bss_conf->bssid);
}
- if (changes & BSS_CHANGED_BEACON && vif->type == NL80211_IFTYPE_ADHOC &&
- priv->beacon_ctx) {
+ if (changes & BSS_CHANGED_BEACON && priv->beacon_ctx == ctx) {
if (iwlagn_update_beacon(priv, vif))
- IWL_ERR(priv, "Error sending IBSS beacon\n");
+ IWL_ERR(priv, "Error updating beacon\n");
}
mutex_unlock(&priv->mutex);
OpenPOWER on IntegriCloud