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.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 28414b3e0c34..ed00552b3418 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -733,14 +733,6 @@ struct ieee80211_rate *ieee80211_get_rate(struct ieee80211_local *local,
733void ieee80211_key_threshold_notify(struct net_device *dev, 733void ieee80211_key_threshold_notify(struct net_device *dev,
734 struct ieee80211_key *key, 734 struct ieee80211_key *key,
735 struct sta_info *sta); 735 struct sta_info *sta);
736u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len);
737int ieee80211_is_eapol(const struct sk_buff *skb);
738
739extern const unsigned char rfc1042_header[6];
740extern const unsigned char bridge_tunnel_header[6];
741
742int ieee80211_frame_duration(struct ieee80211_local *local, size_t len,
743 int rate, int erp, int short_preamble);
744 736
745/* ieee80211_ioctl.c */ 737/* ieee80211_ioctl.c */
746extern const struct iw_handler_def ieee80211_iw_handler_def; 738extern const struct iw_handler_def ieee80211_iw_handler_def;
@@ -833,7 +825,13 @@ struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
833 int idx, size_t key_len, gfp_t flags); 825 int idx, size_t key_len, gfp_t flags);
834void ieee80211_key_free(struct ieee80211_key *key); 826void ieee80211_key_free(struct ieee80211_key *key);
835 827
836/* for wiphy privid */ 828/* utility functions/constants */
837extern void *mac80211_wiphy_privid; 829extern void *mac80211_wiphy_privid; /* for wiphy privid */
830extern const unsigned char rfc1042_header[6];
831extern const unsigned char bridge_tunnel_header[6];
832u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len);
833int ieee80211_is_eapol(const struct sk_buff *skb);
834int ieee80211_frame_duration(struct ieee80211_local *local, size_t len,
835 int rate, int erp, int short_preamble);
838 836
839#endif /* IEEE80211_I_H */ 837#endif /* IEEE80211_I_H */