diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-11 09:53:41 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-11 09:53:41 +0400 |
| commit | de02d72bb3cc5b3d4c873db4ca8291723dd48479 (patch) | |
| tree | c937017bdc271d23ef75c4e0214d45e59227b2d9 /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
| parent | f0ecde1466f21edf577b809735f4f35f354777a0 (diff) | |
| parent | 79733a865c7fd778ce45e3503962b3a875b0a153 (diff) | |
| download | linux-de02d72bb3cc5b3d4c873db4ca8291723dd48479.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index b55e4f39a9e1..b74a56c48d26 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -2967,7 +2967,8 @@ static void iwl3945_bg_request_scan(struct work_struct *data) * is marked passive, we can do active scanning if we * detect transmissions. */ - scan->good_CRC_th = is_active ? IWL_GOOD_CRC_TH : 0; + scan->good_CRC_th = is_active ? IWL_GOOD_CRC_TH_DEFAULT : + IWL_GOOD_CRC_TH_DISABLED; band = IEEE80211_BAND_5GHZ; } else { IWL_WARN(priv, "Invalid scan band count\n"); |