From 34640a88d877b5f2bbb1d5bd6dff7d1d78730f3d Mon Sep 17 00:00:00 2001 From: Sunil Dutt Date: Thu, 20 Feb 2020 15:09:38 +0530 Subject: [PATCH] Fix enum qca_wlan_vendor_attr_config value prefix Couple of the attributes were defined with inconsistent prefix in the name (missing "CONFIG_"). Fix these to use the common prefix for all enum qca_wlan_vendor_attr_config values. Add defined values for the incorrect names to avoid issues with existing users. Signed-off-by: Jouni Malinen --- src/common/qca-vendor.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/common/qca-vendor.h b/src/common/qca-vendor.h index 44d4e6902..516f53296 100644 --- a/src/common/qca-vendor.h +++ b/src/common/qca-vendor.h @@ -2084,7 +2084,7 @@ enum qca_wlan_vendor_attr_config { * take the union of IEs from both of these interfaces and send in * further disassoc/deauth frames. */ - QCA_WLAN_VENDOR_ATTR_DISCONNECT_IES = 58, + QCA_WLAN_VENDOR_ATTR_CONFIG_DISCONNECT_IES = 58, /* 8-bit unsigned value for ELNA bypass. * 1-Enable, 0-Disable @@ -2096,7 +2096,7 @@ enum qca_wlan_vendor_attr_config { * scenarios where STA cannot honor the Beacon Report Request from AP. * 1-Enable, 0-Disable. */ - QCA_WLAN_VENDOR_ATTR_BEACON_REPORT_FAIL = 60, + QCA_WLAN_VENDOR_ATTR_CONFIG_BEACON_REPORT_FAIL = 60, /* keep last */ QCA_WLAN_VENDOR_ATTR_CONFIG_AFTER_LAST, @@ -2104,6 +2104,14 @@ enum qca_wlan_vendor_attr_config { QCA_WLAN_VENDOR_ATTR_CONFIG_AFTER_LAST - 1, }; +/* Compatibility defines for previously used incorrect enum + * qca_wlan_vendor_attr_config names. These values should not be used in any + * new implementation. */ +#define QCA_WLAN_VENDOR_ATTR_DISCONNECT_IES \ + QCA_WLAN_VENDOR_ATTR_CONFIG_DISCONNECT_IES +#define QCA_WLAN_VENDOR_ATTR_BEACON_REPORT_FAIL \ + QCA_WLAN_VENDOR_ATTR_CONFIG_BEACON_REPORT_FAIL + /** * enum qca_wlan_vendor_attr_sap_config - Parameters for AP configuration *