diff options
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 60c2822802f0..6365079e6375 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -667,10 +667,9 @@ struct ieee80211_local { | |||
667 | unsigned long scanning; | 667 | unsigned long scanning; |
668 | struct cfg80211_ssid scan_ssid; | 668 | struct cfg80211_ssid scan_ssid; |
669 | struct cfg80211_scan_request *int_scan_req; | 669 | struct cfg80211_scan_request *int_scan_req; |
670 | struct cfg80211_scan_request *scan_req; | 670 | struct cfg80211_scan_request *scan_req, *hw_scan_req; |
671 | struct ieee80211_channel *scan_channel; | 671 | struct ieee80211_channel *scan_channel; |
672 | const u8 *orig_ies; | 672 | enum ieee80211_band hw_scan_band; |
673 | int orig_ies_len; | ||
674 | int scan_channel_idx; | 673 | int scan_channel_idx; |
675 | int scan_ies_len; | 674 | int scan_ies_len; |
676 | 675 | ||
@@ -1050,7 +1049,8 @@ void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata, | |||
1050 | u8 *extra, size_t extra_len, const u8 *bssid, | 1049 | u8 *extra, size_t extra_len, const u8 *bssid, |
1051 | const u8 *key, u8 key_len, u8 key_idx); | 1050 | const u8 *key, u8 key_len, u8 key_idx); |
1052 | int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer, | 1051 | int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer, |
1053 | const u8 *ie, size_t ie_len); | 1052 | const u8 *ie, size_t ie_len, |
1053 | enum ieee80211_band band); | ||
1054 | void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst, | 1054 | void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst, |
1055 | const u8 *ssid, size_t ssid_len, | 1055 | const u8 *ssid, size_t ssid_len, |
1056 | const u8 *ie, size_t ie_len); | 1056 | const u8 *ie, size_t ie_len); |