diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-06-11 21:47:11 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-06-14 12:18:08 -0400 |
commit | e7d326ac437e9e9425dcd79382f4e5f6ca31fb16 (patch) | |
tree | 82dad05f71fd368c98f30b39eb15921c17487a78 /drivers/net/wireless/iwlwifi/iwl-scan.c | |
parent | 2a421b91d6fe89e27ded7544a25449c0b050098f (diff) |
iwlwifi: move rate helpers to iwlcore
This patch moves rate helpers to iwlcore.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index c2ed7c17ea1f..7b9475b7f0f4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |||
@@ -792,8 +792,9 @@ static void iwl_bg_request_scan(struct work_struct *data) | |||
792 | case 2: | 792 | case 2: |
793 | scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK; | 793 | scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK; |
794 | scan->tx_cmd.rate_n_flags = | 794 | scan->tx_cmd.rate_n_flags = |
795 | iwl4965_hw_set_rate_n_flags(IWL_RATE_1M_PLCP, | 795 | iwl_hw_set_rate_n_flags(IWL_RATE_1M_PLCP, |
796 | RATE_MCS_ANT_B_MSK|RATE_MCS_CCK_MSK); | 796 | RATE_MCS_ANT_B_MSK| |
797 | RATE_MCS_CCK_MSK); | ||
797 | 798 | ||
798 | scan->good_CRC_th = 0; | 799 | scan->good_CRC_th = 0; |
799 | band = IEEE80211_BAND_2GHZ; | 800 | band = IEEE80211_BAND_2GHZ; |
@@ -801,8 +802,8 @@ static void iwl_bg_request_scan(struct work_struct *data) | |||
801 | 802 | ||
802 | case 1: | 803 | case 1: |
803 | scan->tx_cmd.rate_n_flags = | 804 | scan->tx_cmd.rate_n_flags = |
804 | iwl4965_hw_set_rate_n_flags(IWL_RATE_6M_PLCP, | 805 | iwl_hw_set_rate_n_flags(IWL_RATE_6M_PLCP, |
805 | RATE_MCS_ANT_B_MSK); | 806 | RATE_MCS_ANT_B_MSK); |
806 | scan->good_CRC_th = IWL_GOOD_CRC_TH; | 807 | scan->good_CRC_th = IWL_GOOD_CRC_TH; |
807 | band = IEEE80211_BAND_5GHZ; | 808 | band = IEEE80211_BAND_5GHZ; |
808 | break; | 809 | break; |