aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/ieee80211_i.h7
-rw-r--r--net/mac80211/ieee80211_sta.c2
-rw-r--r--net/mac80211/mesh_hwmp.c2
-rw-r--r--net/mac80211/mesh_plink.c1
4 files changed, 2 insertions, 10 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);
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index cb119d3b6353..0f2fc9c4703a 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -57,8 +57,6 @@
57#define IEEE80211_IBSS_MAX_STA_ENTRIES 128 57#define IEEE80211_IBSS_MAX_STA_ENTRIES 128
58 58
59 59
60#define IEEE80211_FC(type, stype) cpu_to_le16(type | stype)
61
62#define ERP_INFO_USE_PROTECTION BIT(1) 60#define ERP_INFO_USE_PROTECTION BIT(1)
63 61
64/* mgmt header + 1 byte action code */ 62/* mgmt header + 1 byte action code */
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 576a6e55323e..02de8f1522a3 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -10,8 +10,6 @@
10#include <asm/unaligned.h> 10#include <asm/unaligned.h>
11#include "mesh.h" 11#include "mesh.h"
12 12
13#define IEEE80211_FC(type, stype) cpu_to_le16(type | stype)
14
15#define TEST_FRAME_LEN 8192 13#define TEST_FRAME_LEN 8192
16#define MAX_METRIC 0xffffffff 14#define MAX_METRIC 0xffffffff
17#define ARITH_SHIFT 8 15#define ARITH_SHIFT 8
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 56c54e321b38..67271baa5b61 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -18,7 +18,6 @@
18#define mpl_dbg(fmt, args...) do { (void)(0); } while (0) 18#define mpl_dbg(fmt, args...) do { (void)(0); } while (0)
19#endif 19#endif
20 20
21#define IEEE80211_FC(type, stype) cpu_to_le16(type | stype)
22#define PLINK_GET_FRAME_SUBTYPE(p) (p) 21#define PLINK_GET_FRAME_SUBTYPE(p) (p)
23#define PLINK_GET_LLID(p) (p + 1) 22#define PLINK_GET_LLID(p) (p + 1)
24#define PLINK_GET_PLID(p) (p + 3) 23#define PLINK_GET_PLID(p) (p + 3)