diff options
| author | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-16 16:43:40 -0400 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-16 16:43:40 -0400 |
| commit | 8715fa28fb4fad62f6004d276ec8e1aa5e664e76 (patch) | |
| tree | 5e07f18c04f497833c6b5f043360f5ef58f1f028 /drivers/net/wireless/iwlwifi/iwl-core.h | |
| parent | a5e944f1d955f3819503348426763e21e0413ba6 (diff) | |
| parent | f2fa1b015e9c199e45c836c769d94db595150731 (diff) | |
Merge branch 'wireless-2.6' into wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-6000.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index d89755f5031..6c3f0127f74 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
| @@ -502,7 +502,7 @@ void iwl_init_scan_params(struct iwl_priv *priv); | |||
| 502 | int iwl_scan_cancel(struct iwl_priv *priv); | 502 | int iwl_scan_cancel(struct iwl_priv *priv); |
| 503 | int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms); | 503 | int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms); |
| 504 | int iwl_mac_hw_scan(struct ieee80211_hw *hw, struct cfg80211_scan_request *req); | 504 | int iwl_mac_hw_scan(struct ieee80211_hw *hw, struct cfg80211_scan_request *req); |
| 505 | int iwl_internal_short_hw_scan(struct iwl_priv *priv); | 505 | void iwl_internal_short_hw_scan(struct iwl_priv *priv); |
| 506 | int iwl_force_reset(struct iwl_priv *priv, int mode); | 506 | int iwl_force_reset(struct iwl_priv *priv, int mode); |
| 507 | u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame, | 507 | u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame, |
| 508 | const u8 *ie, int ie_len, int left); | 508 | const u8 *ie, int ie_len, int left); |