diff options
author | Johannes Berg <johannes.berg@intel.com> | 2014-06-12 16:24:31 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-11-19 12:46:09 -0500 |
commit | a344d6778a98e4c19ac871f369e399e6356edcb3 (patch) | |
tree | 57680bfd10fc013c7a996fbea7212be900f089db /net/mac80211/ieee80211_i.h | |
parent | 6ea0a69ca21bbddab5b3979c2190013b0263e749 (diff) |
mac80211: allow drivers to support NL80211_SCAN_FLAG_RANDOM_ADDR
Allow drivers to support NL80211_SCAN_FLAG_RANDOM_ADDR with software
based scanning and generate a random MAC address for them for every
scan request with the flag.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index dd27180060b9..cf95d033bcbf 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -1249,6 +1249,7 @@ struct ieee80211_local { | |||
1249 | struct work_struct sched_scan_stopped_work; | 1249 | struct work_struct sched_scan_stopped_work; |
1250 | struct ieee80211_sub_if_data __rcu *sched_scan_sdata; | 1250 | struct ieee80211_sub_if_data __rcu *sched_scan_sdata; |
1251 | struct cfg80211_sched_scan_request __rcu *sched_scan_req; | 1251 | struct cfg80211_sched_scan_request __rcu *sched_scan_req; |
1252 | u8 scan_addr[ETH_ALEN]; | ||
1252 | 1253 | ||
1253 | unsigned long leave_oper_channel_time; | 1254 | unsigned long leave_oper_channel_time; |
1254 | enum mac80211_scan_state next_scan_state; | 1255 | enum mac80211_scan_state next_scan_state; |
@@ -1901,12 +1902,14 @@ int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer, | |||
1901 | u8 bands_used, u32 *rate_masks, | 1902 | u8 bands_used, u32 *rate_masks, |
1902 | struct cfg80211_chan_def *chandef); | 1903 | struct cfg80211_chan_def *chandef); |
1903 | struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata, | 1904 | struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata, |
1904 | u8 *dst, u32 ratemask, | 1905 | const u8 *src, const u8 *dst, |
1906 | u32 ratemask, | ||
1905 | struct ieee80211_channel *chan, | 1907 | struct ieee80211_channel *chan, |
1906 | const u8 *ssid, size_t ssid_len, | 1908 | const u8 *ssid, size_t ssid_len, |
1907 | const u8 *ie, size_t ie_len, | 1909 | const u8 *ie, size_t ie_len, |
1908 | bool directed); | 1910 | bool directed); |
1909 | void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst, | 1911 | void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, |
1912 | const u8 *src, const u8 *dst, | ||
1910 | const u8 *ssid, size_t ssid_len, | 1913 | const u8 *ssid, size_t ssid_len, |
1911 | const u8 *ie, size_t ie_len, | 1914 | const u8 *ie, size_t ie_len, |
1912 | u32 ratemask, bool directed, u32 tx_flags, | 1915 | u32 ratemask, bool directed, u32 tx_flags, |