diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-09-13 08:46:33 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-14 16:08:03 -0400 |
| commit | 3eecce527c7434dfd16517ce08b49632c8a26717 (patch) | |
| tree | 7495b3970b2f34d40dc0adbfc8a5a8627a515851 /drivers/net/wireless/iwlwifi/iwl-3945.h | |
| parent | b5be3efc34294cc34e305903df6a388950e8d1f3 (diff) | |
iwlwifi: unify scan start checks
Rather than duplicating all the checks and even
in case of errors accepting the scan request
from mac80211, we can push the checks to the
caller and in all error cases reject the scan
request right away (rather than accepting and
then saying it was aborted).
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Wey-Yi W Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h index bb2aeebf3652..98509c5e708d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945.h | |||
| @@ -295,7 +295,7 @@ extern const struct iwl_channel_info *iwl3945_get_channel_info( | |||
| 295 | extern int iwl3945_rs_next_rate(struct iwl_priv *priv, int rate); | 295 | extern int iwl3945_rs_next_rate(struct iwl_priv *priv, int rate); |
| 296 | 296 | ||
| 297 | /* scanning */ | 297 | /* scanning */ |
| 298 | void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif); | 298 | int iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif); |
| 299 | 299 | ||
| 300 | /* Requires full declaration of iwl_priv before including */ | 300 | /* Requires full declaration of iwl_priv before including */ |
| 301 | #include "iwl-io.h" | 301 | #include "iwl-io.h" |