From 52bc4cb83c4e4e9a3bf24dc02093a185cfd8b581 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 3 Apr 2008 15:17:31 +0200 Subject: [PATCH] --- yaml --- r: 90570 b: refs/heads/master c: 9cfb0009dab6d6b4c5a15c5d74ab60d7a7a7371b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/ieee80211_i.h | 7 ++----- trunk/net/mac80211/ieee80211_sta.c | 2 -- trunk/net/mac80211/mesh_hwmp.c | 2 -- trunk/net/mac80211/mesh_plink.c | 1 - 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 126b99b4f0c8..3142ed727451 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49ec6fa22028054f292c9c290415b88281f7b783 +refs/heads/master: 9cfb0009dab6d6b4c5a15c5d74ab60d7a7a7371b diff --git a/trunk/net/mac80211/ieee80211_i.h b/trunk/net/mac80211/ieee80211_i.h index 377c448a0556..8614c35544bb 100644 --- a/trunk/net/mac80211/ieee80211_i.h +++ b/trunk/net/mac80211/ieee80211_i.h @@ -35,9 +35,9 @@ #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 * associated stations are using power saving. */ @@ -893,11 +893,8 @@ extern const struct iw_handler_def ieee80211_iw_handler_def; /* 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); /* ieee80211_sta.c */ -#define IEEE80211_FC(type, stype) cpu_to_le16(type | stype) void ieee80211_sta_timer(unsigned long data); void ieee80211_sta_work(struct work_struct *work); void ieee80211_sta_scan_work(struct work_struct *work); diff --git a/trunk/net/mac80211/ieee80211_sta.c b/trunk/net/mac80211/ieee80211_sta.c index cb119d3b6353..0f2fc9c4703a 100644 --- a/trunk/net/mac80211/ieee80211_sta.c +++ b/trunk/net/mac80211/ieee80211_sta.c @@ -57,8 +57,6 @@ #define IEEE80211_IBSS_MAX_STA_ENTRIES 128 -#define IEEE80211_FC(type, stype) cpu_to_le16(type | stype) - #define ERP_INFO_USE_PROTECTION BIT(1) /* mgmt header + 1 byte action code */ diff --git a/trunk/net/mac80211/mesh_hwmp.c b/trunk/net/mac80211/mesh_hwmp.c index 576a6e55323e..02de8f1522a3 100644 --- a/trunk/net/mac80211/mesh_hwmp.c +++ b/trunk/net/mac80211/mesh_hwmp.c @@ -10,8 +10,6 @@ #include #include "mesh.h" -#define IEEE80211_FC(type, stype) cpu_to_le16(type | stype) - #define TEST_FRAME_LEN 8192 #define MAX_METRIC 0xffffffff #define ARITH_SHIFT 8 diff --git a/trunk/net/mac80211/mesh_plink.c b/trunk/net/mac80211/mesh_plink.c index 56c54e321b38..67271baa5b61 100644 --- a/trunk/net/mac80211/mesh_plink.c +++ b/trunk/net/mac80211/mesh_plink.c @@ -18,7 +18,6 @@ #define mpl_dbg(fmt, args...) do { (void)(0); } while (0) #endif -#define IEEE80211_FC(type, stype) cpu_to_le16(type | stype) #define PLINK_GET_FRAME_SUBTYPE(p) (p) #define PLINK_GET_LLID(p) (p + 1) #define PLINK_GET_PLID(p) (p + 3)