diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-15 00:28:33 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-15 00:28:33 -0400 |
| commit | eff349b136be49b0569bfdc225b49e28ce66ed22 (patch) | |
| tree | 4043811f5813119fc0f203252b2431642b08b9c8 | |
| parent | 20445cc9159089d9d6b88d7864578efb10eb6590 (diff) | |
| parent | 2474385e5b623fc46cf172a921d94f9f03a9a704 (diff) | |
/spare/repo/netdev-2.6 branch 'ieee80211'
| -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 5df203155aa..6211438058d 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 11524c9b659..6e6e94aec30 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) |