From: Avinash Patil <patila@marvell.com>
Date: Thu, 21 Jun 2012 00:59:01 +0000 (-0700)
Subject: ieee80211: more OUI type definitions for WLAN_OUI_MICROSOFT
X-Git-Tag: 1.9.7~36
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=336e4ca821df4954445f4c29cc6786c88df795b4;p=carl9170fw.git

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>
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
---

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 34aca00..7cee022 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -1663,6 +1663,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