From e372d2438ca64e96bbd488b848c257d39991677b Mon Sep 17 00:00:00 2001 From: Wey-Yi Guy Date: Fri, 3 Sep 2010 11:42:04 -0700 Subject: [PATCH] --- yaml --- r: 214627 b: refs/heads/master c: 8f1d968721f9b3d4ff364bef0f33eb9697a6a7ee h: refs/heads/master i: 214625: 501d7c35516a1c4f08ef62faa3f4d975095cdb8e 214623: 4bee609afb23f5b5dec89ce4b49ed16c1b8119de v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e95bbb5202db..7c8bc055d826 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea196fdbb982150c19854f90773cb8b9bf331049 +refs/heads/master: 8f1d968721f9b3d4ff364bef0f33eb9697a6a7ee diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c index a19671d99248..36df9a7fcbcb 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -226,9 +226,8 @@ int iwl_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) return ret; } } - - priv->start_calib = 0; if (new_assoc) { + priv->start_calib = 0; /* Apply the new configuration * RXON assoc doesn't clear the station table in uCode, */