From: Jeff Garzik <jgarzik@pobox.com>
Date: Mon, 15 Aug 2005 04:32:15 +0000 (-0400)
Subject: ieee80211: remove last uses of compat define WLAN_CAPABILITY_BSS
X-Git-Tag: v2.6.14-rc1~1017^2~10^2
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=1b5cca3a88b7682d538d129c25f0e3092613a243;hp=2474385e5b623fc46cf172a921d94f9f03a9a704;p=linux-2.6-omap-h63xx.git

ieee80211: remove last uses of compat define WLAN_CAPABILITY_BSS
---

diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 6e6e94aec30..51a20b5f3b5 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 25a868c2e2f..2cd571c525a 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;