aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-04-03 09:17:31 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-04-08 16:44:41 -0400
commit9cfb0009dab6d6b4c5a15c5d74ab60d7a7a7371b (patch)
tree0544828786110650436458aa990fa31df56d2a72 /net/mac80211/ieee80211_i.h
parent49ec6fa22028054f292c9c290415b88281f7b783 (diff)
mac80211: clean up IEEE80211_FC use
Really doesn't need to be defined four times. Also, while at it, remove a useless macro (IEEE80211_ALIGN32_PAD) and a function prototype for a function we don't actually have (ieee80211_set_compression.) 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.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 377c448a0556..8614c35544bb 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -35,9 +35,9 @@
35 35
36#define WLAN_FC_DATA_PRESENT(fc) (((fc) & 0x4c) == 0x08) 36#define WLAN_FC_DATA_PRESENT(fc) (((fc) & 0x4c) == 0x08)
37 37
38struct ieee80211_local; 38#define IEEE80211_FC(type, subtype) cpu_to_le16(type | subtype)
39 39
40#define IEEE80211_ALIGN32_PAD(a) ((4 - ((a) & 3)) & 3) 40struct ieee80211_local;
41 41
42/* Maximum number of broadcast/multicast frames to buffer when some of the 42/* Maximum number of broadcast/multicast frames to buffer when some of the
43 * associated stations are using power saving. */ 43 * associated stations are using power saving. */
@@ -893,11 +893,8 @@ extern const struct iw_handler_def ieee80211_iw_handler_def;
893 893
894 894
895/* ieee80211_ioctl.c */ 895/* ieee80211_ioctl.c */
896int ieee80211_set_compression(struct ieee80211_local *local,
897 struct net_device *dev, struct sta_info *sta);
898int ieee80211_set_freq(struct ieee80211_local *local, int freq); 896int ieee80211_set_freq(struct ieee80211_local *local, int freq);
899/* ieee80211_sta.c */ 897/* ieee80211_sta.c */
900#define IEEE80211_FC(type, stype) cpu_to_le16(type | stype)
901void ieee80211_sta_timer(unsigned long data); 898void ieee80211_sta_timer(unsigned long data);
902void ieee80211_sta_work(struct work_struct *work); 899void ieee80211_sta_work(struct work_struct *work);
903void ieee80211_sta_scan_work(struct work_struct *work); 900void ieee80211_sta_scan_work(struct work_struct *work);