diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2010-04-06 04:12:42 -0700 |
|---|---|---|
| committer |   Reinette Chatre <reinette.chatre@intel.com> | 2010-04-16 13:47:37 -0700 |
| commit | b6e4c55aaee4fd40526a6816e60c68dd62e565c4 (patch) | |
| tree | 64bbff3fc159290e41173d0a227375eafe941943 /drivers/net/wireless/iwlwifi/iwl-core.h | |
| parent | iwlwifi: rename priv->scan to priv->scan_cmd (diff) | |
| download | linux-dev-b6e4c55aaee4fd40526a6816e60c68dd62e565c4.tar.xz linux-dev-b6e4c55aaee4fd40526a6816e60c68dd62e565c4.zip | |
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-core.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 6c3f0127f743..1d91ffdd4203 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h @@ -105,6 +105,7 @@ struct iwl_hcmd_utils_ops { __le32 *tx_flags); int (*calc_rssi)(struct iwl_priv *priv, struct iwl_rx_phy_res *rx_resp); + void (*request_scan)(struct iwl_priv *priv); }; struct iwl_apm_ops { @@ -526,6 +527,7 @@ void iwl_setup_scan_deferred_work(struct iwl_priv *priv); #define IWL_ACTIVE_QUIET_TIME cpu_to_le16(10) /* msec */ #define IWL_PLCP_QUIET_THRESH cpu_to_le16(1) /* packets */ +#define IWL_SCAN_CHECK_WATCHDOG (HZ * 7) /******************************************************************************* * Calibrations - implemented in iwl-calib.c |