projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
66572cf
)
ieee80211: more OUI type definitions for WLAN_OUI_MICROSOFT
author
Avinash Patil
<patila@marvell.com>
Thu, 21 Jun 2012 00:59:01 +0000
(17:59 -0700)
committer
Johannes Berg
<johannes.berg@intel.com>
Thu, 21 Jun 2012 14:43:28 +0000
(16:43 +0200)
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>
include/linux/ieee80211.h
patch
|
blob
|
history
diff --git
a/include/linux/ieee80211.h
b/include/linux/ieee80211.h
index
6e06011
..
318fc1f
100644
(file)
--- 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