diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-02-10 15:25:55 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-13 13:45:49 -0500 |
commit | 2a5193119269062608582418deba7af82844159a (patch) | |
tree | 1f2fe8cffbeb7530dce7fa708310f6fb29ab0dd8 /include/net/mac80211.h | |
parent | 849b7967818995a32c3017542e33eb3155944368 (diff) |
cfg80211/nl80211: scanning (and mac80211 update to use it)
This patch adds basic scan capability to cfg80211/nl80211 and
changes mac80211 to use it. The BSS list that cfg80211 maintains
is made driver-accessible with a private area in each BSS struct,
but mac80211 doesn't yet use it. That's another large project.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 341f3e595ebd..88fa3e03e3e9 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -1406,7 +1406,8 @@ struct ieee80211_ops { | |||
1406 | void (*update_tkip_key)(struct ieee80211_hw *hw, | 1406 | void (*update_tkip_key)(struct ieee80211_hw *hw, |
1407 | struct ieee80211_key_conf *conf, const u8 *address, | 1407 | struct ieee80211_key_conf *conf, const u8 *address, |
1408 | u32 iv32, u16 *phase1key); | 1408 | u32 iv32, u16 *phase1key); |
1409 | int (*hw_scan)(struct ieee80211_hw *hw, u8 *ssid, size_t len); | 1409 | int (*hw_scan)(struct ieee80211_hw *hw, |
1410 | struct cfg80211_scan_request *req); | ||
1410 | int (*get_stats)(struct ieee80211_hw *hw, | 1411 | int (*get_stats)(struct ieee80211_hw *hw, |
1411 | struct ieee80211_low_level_stats *stats); | 1412 | struct ieee80211_low_level_stats *stats); |
1412 | void (*get_tkip_seq)(struct ieee80211_hw *hw, u8 hw_key_idx, | 1413 | void (*get_tkip_seq)(struct ieee80211_hw *hw, u8 hw_key_idx, |
@@ -1844,8 +1845,9 @@ void ieee80211_wake_queues(struct ieee80211_hw *hw); | |||
1844 | * mac80211 that the scan finished. | 1845 | * mac80211 that the scan finished. |
1845 | * | 1846 | * |
1846 | * @hw: the hardware that finished the scan | 1847 | * @hw: the hardware that finished the scan |
1848 | * @aborted: set to true if scan was aborted | ||
1847 | */ | 1849 | */ |
1848 | void ieee80211_scan_completed(struct ieee80211_hw *hw); | 1850 | void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted); |
1849 | 1851 | ||
1850 | /** | 1852 | /** |
1851 | * ieee80211_iterate_active_interfaces - iterate active interfaces | 1853 | * ieee80211_iterate_active_interfaces - iterate active interfaces |