diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-20 20:57:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-20 20:57:56 -0400 |
| commit | e46754f8c9333170f11780d8e3a70da1b1a88338 (patch) | |
| tree | 9b7ac1c7cb4c147c69767908c6dcb7633fb03f12 /drivers/net/wireless/iwlwifi/iwl-core.c | |
| parent | ef9e83c1ab2981769f16e626179dd56895041b38 (diff) | |
| parent | fe6f212ce12341df18ef9b890bea739b4547157b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 3352f708663..049b652bcb5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
| @@ -3358,7 +3358,6 @@ static void iwl_force_rf_reset(struct iwl_priv *priv) | |||
| 3358 | */ | 3358 | */ |
| 3359 | IWL_DEBUG_INFO(priv, "perform radio reset.\n"); | 3359 | IWL_DEBUG_INFO(priv, "perform radio reset.\n"); |
| 3360 | iwl_internal_short_hw_scan(priv); | 3360 | iwl_internal_short_hw_scan(priv); |
| 3361 | return; | ||
| 3362 | } | 3361 | } |
| 3363 | 3362 | ||
| 3364 | 3363 | ||