diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-03 14:31:50 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-03 14:31:50 -0400 |
| commit | 7b29dc21ea084be7ddfb536994a9cfae95337690 (patch) | |
| tree | 799f5becd9484e53e09b5f620ebfd5315bdfe033 /include | |
| parent | 9a2e0fb0893ddf595d0a372e681f5b98017c6d90 (diff) | |
| parent | dfe21582ac5ebc460dda98c67e8589dd506d02cd (diff) | |
| download | linux-stable-7b29dc21ea084be7ddfb536994a9cfae95337690.tar.gz linux-stable-7b29dc21ea084be7ddfb536994a9cfae95337690.tar.bz2 linux-stable-7b29dc21ea084be7ddfb536994a9cfae95337690.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ieee80211.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index b2eee5879883..bf56b6f78270 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -1003,8 +1003,12 @@ struct ieee80211_ht_info { #define WLAN_CAPABILITY_ESS (1<<0) #define WLAN_CAPABILITY_IBSS (1<<1) -/* A mesh STA sets the ESS and IBSS capability bits to zero */ -#define WLAN_CAPABILITY_IS_MBSS(cap) \ +/* + * A mesh STA sets the ESS and IBSS capability bits to zero. + * however, this holds true for p2p probe responses (in the p2p_find + * phase) as well. + */ +#define WLAN_CAPABILITY_IS_STA_BSS(cap) \ (!((cap) & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS))) #define WLAN_CAPABILITY_CF_POLLABLE (1<<2) |