From a6634bcf56bbedd9c2778a09059d99253bd623c5 Mon Sep 17 00:00:00 2001 From: Avinash Patil Date: Wed, 20 Jun 2012 17:59:01 -0700 Subject: [PATCH] --- yaml --- r: 314867 b: refs/heads/master c: c2ebea2097f84f0973c58b8467c1a2236bbb307a h: refs/heads/master i: 314865: 4331a14036cb0f1745338935318d3bfb8e27848e 314863: 0fd76ef5fb415396114fe5e4c97ab422923724f2 v: v3 --- [refs] | 2 +- trunk/include/linux/ieee80211.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 561b9008a748..052e43b5c369 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66572cfc30a4b764150c83ee5d842a3ce17991c9 +refs/heads/master: c2ebea2097f84f0973c58b8467c1a2236bbb307a diff --git a/trunk/include/linux/ieee80211.h b/trunk/include/linux/ieee80211.h index 6e0601189db9..318fc1f705b1 100644 --- a/trunk/include/linux/ieee80211.h +++ b/trunk/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