aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2200.c
diff options
context:
space:
mode:
authorJouni Malinen <jkmaline@cc.hut.fi>2005-08-14 23:59:59 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-15 00:28:17 -0400
commit2474385e5b623fc46cf172a921d94f9f03a9a704 (patch)
treeaf2e7e7695e3dc46b8db9d0770dcbab3e58849b5 /drivers/net/wireless/ipw2200.c
parent4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (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>
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
-rw-r--r--drivers/net/wireless/ipw2200.c2
1 files changed, 1 insertions, 1 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(
4190 /* Verify that this network's capability is compatible with the 4190 /* Verify that this network's capability is compatible with the
4191 * current mode (AdHoc or Infrastructure) */ 4191 * current mode (AdHoc or Infrastructure) */
4192 if ((priv->ieee->iw_mode == IW_MODE_INFRA && 4192 if ((priv->ieee->iw_mode == IW_MODE_INFRA &&
4193 !(network->capability & WLAN_CAPABILITY_BSS)) || 4193 !(network->capability & WLAN_CAPABILITY_ESS)) ||
4194 (priv->ieee->iw_mode == IW_MODE_ADHOC && 4194 (priv->ieee->iw_mode == IW_MODE_ADHOC &&
4195 !(network->capability & WLAN_CAPABILITY_IBSS))) { 4195 !(network->capability & WLAN_CAPABILITY_IBSS))) {
4196 IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded due to " 4196 IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded due to "