aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 1579bc92c88d..03e0d22603c8 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -248,9 +248,8 @@ struct mesh_preq_queue {
248#define IEEE80211_STA_EXT_SME BIT(17) 248#define IEEE80211_STA_EXT_SME BIT(17)
249/* flags for MLME request */ 249/* flags for MLME request */
250#define IEEE80211_STA_REQ_SCAN 0 250#define IEEE80211_STA_REQ_SCAN 0
251#define IEEE80211_STA_REQ_DIRECT_PROBE 1 251#define IEEE80211_STA_REQ_AUTH 1
252#define IEEE80211_STA_REQ_AUTH 2 252#define IEEE80211_STA_REQ_RUN 2
253#define IEEE80211_STA_REQ_RUN 3
254 253
255/* bitfield of allowed auth algs */ 254/* bitfield of allowed auth algs */
256#define IEEE80211_AUTH_ALG_OPEN BIT(0) 255#define IEEE80211_AUTH_ALG_OPEN BIT(0)
@@ -659,6 +658,7 @@ struct ieee80211_local {
659 658
660 659
661 /* Scanning and BSS list */ 660 /* Scanning and BSS list */
661 struct mutex scan_mtx;
662 bool sw_scanning, hw_scanning; 662 bool sw_scanning, hw_scanning;
663 struct cfg80211_ssid scan_ssid; 663 struct cfg80211_ssid scan_ssid;
664 struct cfg80211_scan_request int_scan_req; 664 struct cfg80211_scan_request int_scan_req;
@@ -905,7 +905,6 @@ static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)
905 905
906 906
907int ieee80211_hw_config(struct ieee80211_local *local, u32 changed); 907int ieee80211_hw_config(struct ieee80211_local *local, u32 changed);
908int ieee80211_if_config(struct ieee80211_sub_if_data *sdata, u32 changed);
909void ieee80211_tx_set_protected(struct ieee80211_tx_data *tx); 908void ieee80211_tx_set_protected(struct ieee80211_tx_data *tx);
910void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, 909void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
911 u32 changed); 910 u32 changed);
@@ -947,6 +946,8 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata);
947 946
948/* scan/BSS handling */ 947/* scan/BSS handling */
949void ieee80211_scan_work(struct work_struct *work); 948void ieee80211_scan_work(struct work_struct *work);
949int ieee80211_request_internal_scan(struct ieee80211_sub_if_data *sdata,
950 const u8 *ssid, u8 ssid_len);
950int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata, 951int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata,
951 struct cfg80211_scan_request *req); 952 struct cfg80211_scan_request *req);
952int ieee80211_scan_results(struct ieee80211_local *local, 953int ieee80211_scan_results(struct ieee80211_local *local,
@@ -960,9 +961,6 @@ int ieee80211_sta_set_extra_ie(struct ieee80211_sub_if_data *sdata,
960 const char *ie, size_t len); 961 const char *ie, size_t len);
961 962
962void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local); 963void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local);
963void ieee80211_scan_failed(struct ieee80211_local *local);
964int ieee80211_start_scan(struct ieee80211_sub_if_data *scan_sdata,
965 struct cfg80211_scan_request *req);
966struct ieee80211_bss * 964struct ieee80211_bss *
967ieee80211_bss_info_update(struct ieee80211_local *local, 965ieee80211_bss_info_update(struct ieee80211_local *local,
968 struct ieee80211_rx_status *rx_status, 966 struct ieee80211_rx_status *rx_status,
@@ -987,6 +985,8 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata,
987 enum nl80211_iftype type); 985 enum nl80211_iftype type);
988void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata); 986void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata);
989void ieee80211_remove_interfaces(struct ieee80211_local *local); 987void ieee80211_remove_interfaces(struct ieee80211_local *local);
988u32 __ieee80211_recalc_idle(struct ieee80211_local *local);
989void ieee80211_recalc_idle(struct ieee80211_local *local);
990 990
991/* tx handling */ 991/* tx handling */
992void ieee80211_clear_tx_pending(struct ieee80211_local *local); 992void ieee80211_clear_tx_pending(struct ieee80211_local *local);