Skip to content

Commit

Permalink
/spare/repo/netdev-2.6 branch 'ieee80211'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Garzik committed Aug 15, 2005
2 parents 20445cc + 2474385 commit eff349b
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/net/wireless/ipw2200.c
Original file line number Diff line number Diff line change
@@ -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 "
3 changes: 2 additions & 1 deletion include/net/ieee80211.h
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit eff349b

Please sign in to comment.