From 44fe3e4a26d3a92ca17a7ae865661f3a932aa5f4 Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Fri, 11 Jul 2008 11:53:40 +0800 Subject: [PATCH] --- yaml --- r: 103443 b: refs/heads/master c: 36da7d70e307f8650db1b1c7350d2161ca3829ef h: refs/heads/master i: 103441: 49a8662c26e045efd283ed2f102c91d99fbc77d2 103439: 15cd2a638d13b9e7a99d528b56e22266d0171ab9 v: v3 --- [refs] | 2 +- .../net/wireless/iwlwifi/iwl4965-base.c | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index cbd899013822..3d8d37306251 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe905f1d5a8404f45fa0df26e6a870bf1e3b5983 +refs/heads/master: 36da7d70e307f8650db1b1c7350d2161ca3829ef diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c index 55648a8c88a2..71f5da3fe5c4 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -328,16 +328,6 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv) if (!priv->error_recovering) priv->start_calib = 0; - iwl_init_sensitivity(priv); - - /* If we issue a new RXON command which required a tune then we must - * send a new TXPOWER command or we won't be able to Tx any frames */ - ret = iwl_set_tx_power(priv, priv->tx_power_user_lmt, true); - if (ret) { - IWL_ERROR("Error sending TX power (%d)\n", ret); - return ret; - } - /* Add the broadcast address so we can send broadcast frames */ if (iwl_rxon_add_station(priv, iwl_bcast_addr, 0) == IWL_INVALID_STATION) { @@ -373,6 +363,16 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv) memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon)); } + iwl_init_sensitivity(priv); + + /* If we issue a new RXON command which required a tune then we must + * send a new TXPOWER command or we won't be able to Tx any frames */ + ret = iwl_set_tx_power(priv, priv->tx_power_user_lmt, true); + if (ret) { + IWL_ERROR("Error sending TX power (%d)\n", ret); + return ret; + } + return 0; }