From 09f57babfc1e4473db20ced4f58a4c9f082c8ed8 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Tue, 10 Jun 2014 16:07:13 -0700 Subject: Cumulative patch from commit d3b204694a39e6c57a4c6689b87f4192e1b93a06 d3b2046 P2P: Make the default p2p_find delay value configurable 3dacd3e atheros: Add support for new GCMP/CCMP/CMAC/GMAC cipher suites 737754d EAP-IKEv2: Remove obsolete ccns.pl project workarounds aa6bf6d eap_proxy: Check sm != NULL more consistently 4f4d51e TDLS: Add extra validation step for responder RSN IE length a01acc5 Check for EVENT_ASSOC data to be present for AP mode operation 1fde15a GAS server: Explicitly check that home realm is available aff0bee GAS server: Remove unused function parameter 86388af WPS: Check for theoretical gmtime() failure d75a5ae WPS ER: Fix UDN parser to handle missing field 0bbaa9b Validate driver extended capabilities length against buffer length 9c6c558 Interworking: Reject EAP configuration with unsupported inner method f2ca0e9 Check eap_get_name() return against NULL to silence static analyzer bc32bb7 Make a code path easier for static analyzers to understand fb958ea Check current_ssid on unexpected association event 2a57c33 Reserve QCA vendor specific nl80211 commands 20..33 84df167 nl80211: Add vendor attribute for interface index 9949483 The master branch is now used for v2.3 development Change-Id: Ib39c204aaa3ebcc909057f815e5e291e15e5df88 Signed-off-by: Dmitry Shmidt --- src/common/qca-vendor.h | 4 +++- src/common/version.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/common') diff --git a/src/common/qca-vendor.h b/src/common/qca-vendor.h index a56b1880..4d9efd52 100644 --- a/src/common/qca-vendor.h +++ b/src/common/qca-vendor.h @@ -52,7 +52,7 @@ enum qca_nl80211_vendor_subcmds { 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 */ + /* 14..33 - reserved for QCA */ }; @@ -64,6 +64,8 @@ enum qca_wlan_vendor_attr { QCA_WLAN_VENDOR_ATTR_NAN = 2, /* used by QCA_NL80211_VENDOR_SUBCMD_STATS_EXT */ QCA_WLAN_VENDOR_ATTR_STATS_EXT = 3, + /* used by QCA_NL80211_VENDOR_SUBCMD_STATS_EXT */ + QCA_WLAN_VENDOR_ATTR_IFINDEX = 4, /* keep last */ QCA_WLAN_VENDOR_ATTR_AFTER_LAST, QCA_WLAN_VENDOR_ATTR_MAX = QCA_WLAN_VENDOR_ATTR_AFTER_LAST - 1, diff --git a/src/common/version.h b/src/common/version.h index 340afc7e..1f254329 100644 --- a/src/common/version.h +++ b/src/common/version.h @@ -5,6 +5,6 @@ #define VERSION_STR_POSTFIX "" #endif /* VERSION_STR_POSTFIX */ -#define VERSION_STR "2.2" VERSION_STR_POSTFIX +#define VERSION_STR "2.3-devel" VERSION_STR_POSTFIX #endif /* VERSION_H */ -- cgit v1.2.3