From 265a24b6f484ca1b90834454cdf5258ff960bfdd Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 8 Feb 2013 23:13:39 +0100 Subject: [PATCH] --- yaml --- r: 352679 b: refs/heads/master c: 739e42f4f3fc5906db049b54e45498c7ab5bba81 h: refs/heads/master i: 352677: bba2969670338709488d2b9dd90f8a88b23319ef 352675: 3c408ae052220d2ce23300869674d8705e61bd93 352671: c8e266a22d165b5524cad39d988657762479f322 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/dvm/rxon.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c210e86cc80d..2e871df3a439 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b26b5002937850846046a99de8c6065ff86fa6d +refs/heads/master: 739e42f4f3fc5906db049b54e45498c7ab5bba81 diff --git a/trunk/drivers/net/wireless/iwlwifi/dvm/rxon.c b/trunk/drivers/net/wireless/iwlwifi/dvm/rxon.c index 9fabd26997ca..23be948cf162 100644 --- a/trunk/drivers/net/wireless/iwlwifi/dvm/rxon.c +++ b/trunk/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);