Cumulative patch from commit 2396f02a431dd6e4526fd79c93f06695211cb3e4
2396f02 Reserve QCA vendor specific nl80211 commands 14..19
5661bd0 P2P: Avoid resetting pending_listen_freq if p2p_listen is pending
8802326 nl80211: Indicate SHA256-based AKM suites in CONNECT/ASSOCIATE
Change-Id: Id62b66e9683e87e888b91e0fd6407c1beb87b9c6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
index 8fe2e4a..b8e9254 100644
--- a/src/common/ieee802_11_defs.h
+++ b/src/common/ieee802_11_defs.h
@@ -1119,6 +1119,8 @@
#define WLAN_AKM_SUITE_PSK 0x000FAC02
#define WLAN_AKM_SUITE_FT_8021X 0x000FAC03
#define WLAN_AKM_SUITE_FT_PSK 0x000FAC04
+#define WLAN_AKM_SUITE_8021X_SHA256 0x000FAC05
+#define WLAN_AKM_SUITE_PSK_SHA256 0x000FAC06
#define WLAN_AKM_SUITE_CCKM 0x00409600
#define WLAN_AKM_SUITE_OSEN 0x506f9a01
diff --git a/src/common/qca-vendor.h b/src/common/qca-vendor.h
index 1bc981b..a56b188 100644
--- a/src/common/qca-vendor.h
+++ b/src/common/qca-vendor.h
@@ -52,6 +52,7 @@
QCA_NL80211_VENDOR_SUBCMD_DFS_CAPABILITY = 11,
QCA_NL80211_VENDOR_SUBCMD_NAN = 12,
QCA_NL80211_VENDOR_SUBMCD_STATS_EXT = 13,
+ /* 14..19 - reserved for QCA */
};