[Ieee80211-devel] [PATCH ieee80211-wifi 8/9] ieee80211: Capability field is called ESS, not BSS

[Jouni M. <jkm...@cc...>]

IEEE 802.11 has a capability field flag called ESS, but ieee80211 had
renamed this to BSS for some reason. hostap has been using
WLAN_CAPABILITY_ESS and since that matches with the standard, lets use
it as the name for this define. Add WLAN_CAPABILITY_BSS as a backwards
compatibility name for the same bit since ieee80211 and ipw2200 are
using this and there are versions outside kernel tree that expect to
find this define name.

Signed-off-by: Jouni Malinen <jkm...@cc...>

Index: netdev-2.6/include/net/ieee80211.h
===================================================================
--- netdev-2.6.orig/include/net/ieee80211.h
+++ netdev-2.6/include/net/ieee80211.h
@@ -263,7 +263,8 @@ struct ieee80211_snap_hdr {
 
 #define WLAN_AUTH_CHALLENGE_LEN 128
 
-#define WLAN_CAPABILITY_BSS (1<<0)
+#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)
Index: netdev-2.6/drivers/net/wireless/ipw2200.c
===================================================================
--- netdev-2.6.orig/drivers/net/wireless/ipw2200.c
+++ netdev-2.6/drivers/net/wireless/ipw2200.c
@@ -4190,7 +4190,7 @@ static int ipw_best_network(
 	/* Verify that this network's capability is compatible with the
 	 * current mode (AdHoc or Infrastructure) */
 	if ((priv->ieee->iw_mode == IW_MODE_INFRA &&
-	     !(network->capability & WLAN_CAPABILITY_BSS)) || 
+	     !(network->capability & WLAN_CAPABILITY_ESS)) || 
 	    (priv->ieee->iw_mode == IW_MODE_ADHOC &&
 	     !(network->capability & WLAN_CAPABILITY_IBSS))) {
 		IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded due to "
Index: netdev-2.6/net/ieee80211/ieee80211_wx.c
===================================================================
--- netdev-2.6.orig/net/ieee80211/ieee80211_wx.c
+++ netdev-2.6/net/ieee80211/ieee80211_wx.c
@@ -77,8 +77,8 @@ static inline char *ipw2100_translate_sc
         /* 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;
Index: netdev-2.6/drivers/net/wireless/hostap/hostap_common.h
===================================================================
--- netdev-2.6.orig/drivers/net/wireless/hostap/hostap_common.h
+++ netdev-2.6/drivers/net/wireless/hostap/hostap_common.h
@@ -19,9 +19,6 @@
 #define WLAN_FC_ISWEP BIT(14)
 #define WLAN_FC_ORDER BIT(15)
 
-#define WLAN_CAPABILITY_ESS WLAN_CAPABILITY_BSS
-
-
 /* Information Element IDs */
 #define WLAN_EID_SSID 0
 #define WLAN_EID_SUPP_RATES 1

--
-- 
Jouni Malinen                                            PGP id EFC895FA