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.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 4be11ea3dfc4..bd7a451b0849 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1260,6 +1260,7 @@ int ieee80211_request_internal_scan(struct ieee80211_sub_if_data *sdata,
1260int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata, 1260int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata,
1261 struct cfg80211_scan_request *req); 1261 struct cfg80211_scan_request *req);
1262void ieee80211_scan_cancel(struct ieee80211_local *local); 1262void ieee80211_scan_cancel(struct ieee80211_local *local);
1263void ieee80211_run_deferred_scan(struct ieee80211_local *local);
1263ieee80211_rx_result 1264ieee80211_rx_result
1264ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb); 1265ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb);
1265 1266
@@ -1272,9 +1273,6 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
1272 struct ieee802_11_elems *elems, 1273 struct ieee802_11_elems *elems,
1273 struct ieee80211_channel *channel, 1274 struct ieee80211_channel *channel,
1274 bool beacon); 1275 bool beacon);
1275struct ieee80211_bss *
1276ieee80211_rx_bss_get(struct ieee80211_local *local, u8 *bssid, int freq,
1277 u8 *ssid, u8 ssid_len);
1278void ieee80211_rx_bss_put(struct ieee80211_local *local, 1276void ieee80211_rx_bss_put(struct ieee80211_local *local,
1279 struct ieee80211_bss *bss); 1277 struct ieee80211_bss *bss);
1280 1278
@@ -1403,7 +1401,7 @@ static inline int __ieee80211_resume(struct ieee80211_hw *hw)
1403extern void *mac80211_wiphy_privid; /* for wiphy privid */ 1401extern void *mac80211_wiphy_privid; /* for wiphy privid */
1404u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len, 1402u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len,
1405 enum nl80211_iftype type); 1403 enum nl80211_iftype type);
1406int ieee80211_frame_duration(struct ieee80211_local *local, size_t len, 1404int ieee80211_frame_duration(enum ieee80211_band band, size_t len,
1407 int rate, int erp, int short_preamble); 1405 int rate, int erp, int short_preamble);
1408void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx, 1406void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx,
1409 struct ieee80211_hdr *hdr, const u8 *tsc, 1407 struct ieee80211_hdr *hdr, const u8 *tsc,