Commit 2474385e authored by Jouni Malinen's avatar Jouni Malinen Committed by Jeff Garzik
Browse files

[PATCH] ieee80211: Capability field is called ESS, not BSS 



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: default avatarJouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 4c0e176d

drivers/net/wireless/ipw2200.c

+1 −1
Original line number Diff line number Diff line
@@ -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 "

include/net/ieee80211.h

+2 −1
Original line number Diff line number Diff line
@@ -264,7 +264,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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE