Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eff349b1 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

/spare/repo/netdev-2.6 branch 'ieee80211'

parents 20445cc9 2474385e

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)