From e9c6ff6bad9d82acd17ff0ac974fb456abbf3700 Mon Sep 17 00:00:00 2001
From: Avinash Patil <patila@marvell.com>
Date: Mon, 11 Jun 2012 18:14:16 -0700
Subject: [PATCH] --- yaml --- r: 314804 b: refs/heads/master c:
 535588e61a007416f46cf08b4ccb6cc73b3f6fb0 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/ieee80211.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8bbc44bd328d..7309e3018694 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cef28271be62e672637f1ba2a019a5a9a981eb2d
+refs/heads/master: 535588e61a007416f46cf08b4ccb6cc73b3f6fb0
diff --git a/trunk/include/linux/ieee80211.h b/trunk/include/linux/ieee80211.h
index f831078182de..98c86ff657bb 100644
--- a/trunk/include/linux/ieee80211.h
+++ b/trunk/include/linux/ieee80211.h
@@ -1589,6 +1589,8 @@ enum ieee80211_sa_query_action {
 
 #define WLAN_OUI_WFA			0x506f9a
 #define WLAN_OUI_TYPE_WFA_P2P		9
+#define WLAN_OUI_MICROSOFT		0x0050f2
+#define WLAN_OUI_TYPE_MICROSOFT_WPA	1
 
 /*
  * WMM/802.11e Tspec Element