Commit 9cfb0009 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 49ec6fa2
...@@ -35,9 +35,9 @@ ...@@ -35,9 +35,9 @@
#define WLAN_FC_DATA_PRESENT(fc) (((fc) & 0x4c) == 0x08) #define WLAN_FC_DATA_PRESENT(fc) (((fc) & 0x4c) == 0x08)
struct ieee80211_local; #define IEEE80211_FC(type, subtype) cpu_to_le16(type | subtype)
#define IEEE80211_ALIGN32_PAD(a) ((4 - ((a) & 3)) & 3) struct ieee80211_local;
/* Maximum number of broadcast/multicast frames to buffer when some of the /* Maximum number of broadcast/multicast frames to buffer when some of the
* associated stations are using power saving. */ * associated stations are using power saving. */
...@@ -893,11 +893,8 @@ extern const struct iw_handler_def ieee80211_iw_handler_def; ...@@ -893,11 +893,8 @@ extern const struct iw_handler_def ieee80211_iw_handler_def;
/* ieee80211_ioctl.c */ /* ieee80211_ioctl.c */
int ieee80211_set_compression(struct ieee80211_local *local,
struct net_device *dev, struct sta_info *sta);
int ieee80211_set_freq(struct ieee80211_local *local, int freq); int ieee80211_set_freq(struct ieee80211_local *local, int freq);
/* ieee80211_sta.c */ /* ieee80211_sta.c */
#define IEEE80211_FC(type, stype) cpu_to_le16(type | stype)
void ieee80211_sta_timer(unsigned long data); void ieee80211_sta_timer(unsigned long data);
void ieee80211_sta_work(struct work_struct *work); void ieee80211_sta_work(struct work_struct *work);
void ieee80211_sta_scan_work(struct work_struct *work); void ieee80211_sta_scan_work(struct work_struct *work);
......
...@@ -57,8 +57,6 @@ ...@@ -57,8 +57,6 @@
#define IEEE80211_IBSS_MAX_STA_ENTRIES 128 #define IEEE80211_IBSS_MAX_STA_ENTRIES 128
#define IEEE80211_FC(type, stype) cpu_to_le16(type | stype)
#define ERP_INFO_USE_PROTECTION BIT(1) #define ERP_INFO_USE_PROTECTION BIT(1)
/* mgmt header + 1 byte action code */ /* mgmt header + 1 byte action code */
......
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include "mesh.h" #include "mesh.h"
#define IEEE80211_FC(type, stype) cpu_to_le16(type | stype)
#define TEST_FRAME_LEN 8192 #define TEST_FRAME_LEN 8192
#define MAX_METRIC 0xffffffff #define MAX_METRIC 0xffffffff
#define ARITH_SHIFT 8 #define ARITH_SHIFT 8
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define mpl_dbg(fmt, args...) do { (void)(0); } while (0) #define mpl_dbg(fmt, args...) do { (void)(0); } while (0)
#endif #endif
#define IEEE80211_FC(type, stype) cpu_to_le16(type | stype)
#define PLINK_GET_FRAME_SUBTYPE(p) (p) #define PLINK_GET_FRAME_SUBTYPE(p) (p)
#define PLINK_GET_LLID(p) (p + 1) #define PLINK_GET_LLID(p) (p + 1)
#define PLINK_GET_PLID(p) (p + 3) #define PLINK_GET_PLID(p) (p + 3)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment