diff options
| author | Jouni Malinen | 2005-08-14 20:59:59 -0700 |
|---|---|---|
| committer | Jeff Garzik | 2005-08-15 00:28:17 -0400 |
| commit | 2474385e5b623fc46cf172a921d94f9f03a9a704 (patch) | |
| tree | af2e7e7695e3dc46b8db9d0770dcbab3e58849b5 | |
| parent | 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (diff) | |
[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: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| -rw-r--r-- | drivers/net/wireless/ipw2200.c | 2 | ||||
| -rw-r--r-- | include/net/ieee80211.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 5df203155aa3..6211438058de 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/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 " diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 11524c9b659a..6e6e94aec303 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -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) |