diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-09-09 09:07:09 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-09-11 15:53:39 -0400 |
commit | e50db65c0dad109aae77c353305853b31555b228 (patch) | |
tree | 1c7f765e172092e2d6d0e63a1faa13c004f79c7a /net/mac80211/ieee80211_i.h | |
parent | 759ef3eb1eeba8ff7411771e7b9cf6bfd6bb9cfe (diff) |
mac80211: move frame TX function
The ieee80211_sta_tx function isn't MLME code any more,
it's getting used by a lot of code. Move it to utils and
rename it to ieee80211_tx_skb.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index b2ca9e6122c6..6f334e4c3d66 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -912,8 +912,6 @@ u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata); | |||
912 | u64 ieee80211_sta_get_rates(struct ieee80211_local *local, | 912 | u64 ieee80211_sta_get_rates(struct ieee80211_local *local, |
913 | struct ieee802_11_elems *elems, | 913 | struct ieee802_11_elems *elems, |
914 | enum ieee80211_band band); | 914 | enum ieee80211_band band); |
915 | void ieee80211_sta_tx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, | ||
916 | int encrypt); | ||
917 | void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst, | 915 | void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst, |
918 | u8 *ssid, size_t ssid_len); | 916 | u8 *ssid, size_t ssid_len); |
919 | void ieee802_11_parse_elems(u8 *start, size_t len, | 917 | void ieee802_11_parse_elems(u8 *start, size_t len, |
@@ -1000,6 +998,8 @@ int ieee80211_frame_duration(struct ieee80211_local *local, size_t len, | |||
1000 | void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx, | 998 | void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx, |
1001 | struct ieee80211_hdr *hdr); | 999 | struct ieee80211_hdr *hdr); |
1002 | void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata); | 1000 | void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata); |
1001 | void ieee80211_tx_skb(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, | ||
1002 | int encrypt); | ||
1003 | 1003 | ||
1004 | #ifdef CONFIG_MAC80211_NOINLINE | 1004 | #ifdef CONFIG_MAC80211_NOINLINE |
1005 | #define debug_noinline noinline | 1005 | #define debug_noinline noinline |