projects
/
carl9170fw.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b75301
)
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
Christian Lamparter
<chunkeey@googlemail.com>
Sat, 21 Jul 2012 13:37:23 +0000
(15:37 +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>
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
include/linux/ieee80211.h
patch
|
blob
|
history
diff --git
a/include/linux/ieee80211.h
b/include/linux/ieee80211.h
index 34aca00f24e2ff689b9690b7b07ed70113505202..7cee022fdc45f2e288b3f26a50baf2fc32955b6a 100644
(file)
--- 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