From 1b5cca3a88b7682d538d129c25f0e3092613a243 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Mon, 15 Aug 2005 00:32:15 -0400 Subject: [PATCH] ieee80211: remove last uses of compat define WLAN_CAPABILITY_BSS --- include/net/ieee80211.h | 1 - net/ieee80211/ieee80211_wx.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 6e6e94aec3037..51a20b5f3b5d5 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -265,7 +265,6 @@ struct ieee80211_snap_hdr { #define WLAN_AUTH_CHALLENGE_LEN 128 #define WLAN_CAPABILITY_ESS (1<<0) -#define WLAN_CAPABILITY_BSS WLAN_CAPABILITY_ESS #define WLAN_CAPABILITY_IBSS (1<<1) #define WLAN_CAPABILITY_CF_POLLABLE (1<<2) #define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3) diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c index 25a868c2e2f78..2cd571c525a96 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, /* Add mode */ iwe.cmd = SIOCGIWMODE; if (network->capability & - (WLAN_CAPABILITY_BSS | WLAN_CAPABILITY_IBSS)) { - if (network->capability & WLAN_CAPABILITY_BSS) + (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)) { + if (network->capability & WLAN_CAPABILITY_ESS) iwe.u.mode = IW_MODE_MASTER; else iwe.u.mode = IW_MODE_ADHOC;