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, 8 insertions, 6 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 9d3401d12917..af8b9848e021 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -719,12 +719,6 @@ static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)
719int ieee80211_hw_config(struct ieee80211_local *local); 719int ieee80211_hw_config(struct ieee80211_local *local);
720int ieee80211_if_config(struct net_device *dev); 720int ieee80211_if_config(struct net_device *dev);
721int ieee80211_if_config_beacon(struct net_device *dev); 721int ieee80211_if_config_beacon(struct net_device *dev);
722struct ieee80211_key_conf *
723ieee80211_key_data2conf(struct ieee80211_local *local,
724 const struct ieee80211_key *data);
725struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
726 int idx, size_t key_len, gfp_t flags);
727void ieee80211_key_free(struct ieee80211_key *key);
728void ieee80211_rx_mgmt(struct ieee80211_local *local, struct sk_buff *skb, 722void ieee80211_rx_mgmt(struct ieee80211_local *local, struct sk_buff *skb,
729 struct ieee80211_rx_status *status, u32 msg_type); 723 struct ieee80211_rx_status *status, u32 msg_type);
730void ieee80211_prepare_rates(struct ieee80211_local *local, 724void ieee80211_prepare_rates(struct ieee80211_local *local,
@@ -833,6 +827,14 @@ int ieee80211_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev);
833int ieee80211_subif_start_xmit(struct sk_buff *skb, struct net_device *dev); 827int ieee80211_subif_start_xmit(struct sk_buff *skb, struct net_device *dev);
834int ieee80211_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev); 828int ieee80211_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev);
835 829
830/* key handling */
831struct ieee80211_key_conf *
832ieee80211_key_data2conf(struct ieee80211_local *local,
833 const struct ieee80211_key *data);
834struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
835 int idx, size_t key_len, gfp_t flags);
836void ieee80211_key_free(struct ieee80211_key *key);
837
836/* for wiphy privid */ 838/* for wiphy privid */
837extern void *mac80211_wiphy_privid; 839extern void *mac80211_wiphy_privid;
838 840