/spare/repo/netdev-2.6 branch 'ieee80211'

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)

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;