summaryrefslogtreecommitdiff
path: root/include/linux/ieee80211.h
diff options
context:
space:
mode:
authorAvinash Patil <patila@marvell.com>2012-06-20 17:59:01 -0700
committerJohannes Berg <johannes.berg@intel.com>2012-06-21 16:43:28 +0200
commitc2ebea2097f84f0973c58b8467c1a2236bbb307a (patch)
tree443c740e57bb26ba0911f75c2512b9f40159c6d6 /include/linux/ieee80211.h
parent66572cfc30a4b764150c83ee5d842a3ce17991c9 (diff)
downloadlinux-3.10-c2ebea2097f84f0973c58b8467c1a2236bbb307a.tar.gz
linux-3.10-c2ebea2097f84f0973c58b8467c1a2236bbb307a.tar.bz2
linux-3.10-c2ebea2097f84f0973c58b8467c1a2236bbb307a.zip
ieee80211: more OUI type definitions for WLAN_OUI_MICROSOFT
WMM and WPS Signed-off-by: Avinash Patil <patila@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/linux/ieee80211.h')
-rw-r--r--include/linux/ieee80211.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 6e0601189db..318fc1f705b 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -1633,6 +1633,8 @@ enum ieee80211_sa_query_action {
#define WLAN_OUI_TYPE_WFA_P2P 9
#define WLAN_OUI_MICROSOFT 0x0050f2
#define WLAN_OUI_TYPE_MICROSOFT_WPA 1
+#define WLAN_OUI_TYPE_MICROSOFT_WMM 2
+#define WLAN_OUI_TYPE_MICROSOFT_WPS 4
/*
* WMM/802.11e Tspec Element