aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-15 00:32:15 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-15 00:32:15 -0400
commit1b5cca3a88b7682d538d129c25f0e3092613a243 (patch)
tree45c295e640707d44ad30100698e8df2b50012612
parent2474385e5b623fc46cf172a921d94f9f03a9a704 (diff)
ieee80211: remove last uses of compat define WLAN_CAPABILITY_BSS
-rw-r--r--include/net/ieee80211.h1
-rw-r--r--net/ieee80211/ieee80211_wx.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 6e6e94aec303..51a20b5f3b5d 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -265,7 +265,6 @@ struct ieee80211_snap_hdr {
265#define WLAN_AUTH_CHALLENGE_LEN 128 265#define WLAN_AUTH_CHALLENGE_LEN 128
266 266
267#define WLAN_CAPABILITY_ESS (1<<0) 267#define WLAN_CAPABILITY_ESS (1<<0)
268#define WLAN_CAPABILITY_BSS WLAN_CAPABILITY_ESS
269#define WLAN_CAPABILITY_IBSS (1<<1) 268#define WLAN_CAPABILITY_IBSS (1<<1)
270#define WLAN_CAPABILITY_CF_POLLABLE (1<<2) 269#define WLAN_CAPABILITY_CF_POLLABLE (1<<2)
271#define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3) 270#define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3)
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 25a868c2e2f7..2cd571c525a9 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -77,8 +77,8 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
77 /* Add mode */ 77 /* Add mode */
78 iwe.cmd = SIOCGIWMODE; 78 iwe.cmd = SIOCGIWMODE;
79 if (network->capability & 79 if (network->capability &
80 (WLAN_CAPABILITY_BSS | WLAN_CAPABILITY_IBSS)) { 80 (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)) {
81 if (network->capability & WLAN_CAPABILITY_BSS) 81 if (network->capability & WLAN_CAPABILITY_ESS)
82 iwe.u.mode = IW_MODE_MASTER; 82 iwe.u.mode = IW_MODE_MASTER;
83 else 83 else
84 iwe.u.mode = IW_MODE_ADHOC; 84 iwe.u.mode = IW_MODE_ADHOC;