diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-07-27 09:43:22 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:47:33 -0400 |
commit | e2ebc74d7e3d71600640db6fbb28cc2f362184c1 (patch) | |
tree | 7f9a830869b9f6157ee8235feb4953df7a639dbd /net/mac80211/ieee80211_i.h | |
parent | 340e11f332c695c43f506e82b1d39d00716c5005 (diff) |
[MAC80211]: split TX path into own file
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Jiri Benc <jbenc@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 35e2ce52faeb..9d3401d12917 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -731,8 +731,6 @@ void ieee80211_prepare_rates(struct ieee80211_local *local, | |||
731 | struct ieee80211_hw_mode *mode); | 731 | struct ieee80211_hw_mode *mode); |
732 | void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx); | 732 | void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx); |
733 | int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr); | 733 | int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr); |
734 | int ieee80211_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev); | ||
735 | int ieee80211_subif_start_xmit(struct sk_buff *skb, struct net_device *dev); | ||
736 | void ieee80211_if_setup(struct net_device *dev); | 734 | void ieee80211_if_setup(struct net_device *dev); |
737 | void ieee80211_if_mgmt_setup(struct net_device *dev); | 735 | void ieee80211_if_mgmt_setup(struct net_device *dev); |
738 | int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local, | 736 | int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local, |
@@ -746,8 +744,11 @@ void ieee80211_key_threshold_notify(struct net_device *dev, | |||
746 | u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len); | 744 | u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len); |
747 | int ieee80211_is_eapol(const struct sk_buff *skb); | 745 | int ieee80211_is_eapol(const struct sk_buff *skb); |
748 | 746 | ||
749 | extern const unsigned char rfc1042_header[]; | 747 | extern const unsigned char rfc1042_header[6]; |
750 | extern const unsigned char bridge_tunnel_header[]; | 748 | extern const unsigned char bridge_tunnel_header[6]; |
749 | |||
750 | int ieee80211_frame_duration(struct ieee80211_local *local, size_t len, | ||
751 | int rate, int erp, int short_preamble); | ||
751 | 752 | ||
752 | /* ieee80211_ioctl.c */ | 753 | /* ieee80211_ioctl.c */ |
753 | extern const struct iw_handler_def ieee80211_iw_handler_def; | 754 | extern const struct iw_handler_def ieee80211_iw_handler_def; |
@@ -823,6 +824,15 @@ void ieee80211_set_default_regdomain(struct ieee80211_hw_mode *mode); | |||
823 | extern ieee80211_rx_handler ieee80211_rx_pre_handlers[]; | 824 | extern ieee80211_rx_handler ieee80211_rx_pre_handlers[]; |
824 | extern ieee80211_rx_handler ieee80211_rx_handlers[]; | 825 | extern ieee80211_rx_handler ieee80211_rx_handlers[]; |
825 | 826 | ||
827 | /* tx handling */ | ||
828 | extern ieee80211_tx_handler ieee80211_tx_handlers[]; | ||
829 | void ieee80211_clear_tx_pending(struct ieee80211_local *local); | ||
830 | void ieee80211_tx_pending(unsigned long data); | ||
831 | int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev); | ||
832 | int ieee80211_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev); | ||
833 | int ieee80211_subif_start_xmit(struct sk_buff *skb, struct net_device *dev); | ||
834 | int ieee80211_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev); | ||
835 | |||
826 | /* for wiphy privid */ | 836 | /* for wiphy privid */ |
827 | extern void *mac80211_wiphy_privid; | 837 | extern void *mac80211_wiphy_privid; |
828 | 838 | ||