/spare/repo/netdev-2.6 branch 'ieee80211'
This commit is contained in:
@@ -4190,7 +4190,7 @@ static int ipw_best_network(
|
|||||||
/* Verify that this network's capability is compatible with the
|
/* Verify that this network's capability is compatible with the
|
||||||
* current mode (AdHoc or Infrastructure) */
|
* current mode (AdHoc or Infrastructure) */
|
||||||
if ((priv->ieee->iw_mode == IW_MODE_INFRA &&
|
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 &&
|
(priv->ieee->iw_mode == IW_MODE_ADHOC &&
|
||||||
!(network->capability & WLAN_CAPABILITY_IBSS))) {
|
!(network->capability & WLAN_CAPABILITY_IBSS))) {
|
||||||
IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded due to "
|
IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded due to "
|
||||||
|
@@ -264,7 +264,8 @@ struct ieee80211_snap_hdr {
|
|||||||
|
|
||||||
#define WLAN_AUTH_CHALLENGE_LEN 128
|
#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_IBSS (1<<1)
|
||||||
#define WLAN_CAPABILITY_CF_POLLABLE (1<<2)
|
#define WLAN_CAPABILITY_CF_POLLABLE (1<<2)
|
||||||
#define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3)
|
#define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3)
|
||||||
|
Reference in New Issue
Block a user