diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-04-06 07:12:42 -0400 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-16 16:47:37 -0400 |
commit | b6e4c55aaee4fd40526a6816e60c68dd62e565c4 (patch) | |
tree | 64bbff3fc159290e41173d0a227375eafe941943 /drivers/net/wireless/iwlwifi/iwl-4965.c | |
parent | 811ecc995b18eb58067ffa75b961ece3b84a1f03 (diff) |
iwlwifi: trigger scan synchronously
Scan requesting doesn't need to be asynchronous
since all code paths leading up to it can sleep.
Make the scan request a new util operation that
is hw-specific (to account for 3945 vs. agn)
and call it right in place.
This patch moves a lot of code into iwlagn as
it need not be in iwlcore.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 2e3cda75f3a..0a5f21e1488 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -2162,6 +2162,7 @@ static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = { | |||
2162 | .gain_computation = iwl4965_gain_computation, | 2162 | .gain_computation = iwl4965_gain_computation, |
2163 | .rts_tx_cmd_flag = iwlcore_rts_tx_cmd_flag, | 2163 | .rts_tx_cmd_flag = iwlcore_rts_tx_cmd_flag, |
2164 | .calc_rssi = iwl4965_calc_rssi, | 2164 | .calc_rssi = iwl4965_calc_rssi, |
2165 | .request_scan = iwlagn_request_scan, | ||
2165 | }; | 2166 | }; |
2166 | 2167 | ||
2167 | static struct iwl_lib_ops iwl4965_lib = { | 2168 | static struct iwl_lib_ops iwl4965_lib = { |