From 48701e295f4677f53ad0abab0557f5fa217a4373 Mon Sep 17 00:00:00 2001 From: Will Huang Date: Fri, 14 Jul 2017 13:13:19 +0800 Subject: [PATCH] qcacld-3.0: Move short name redefinitions from qca_vendor.h These short name redefinitions should just be used in source file for convenience, should not exist in qca_vendor.h where interfaces are defined there. To avoid checkin two way dependencies, add ifndef/define in source file and first checkin qcacmn head file which remove these redefinitions, then remove these ifndef/define from source file in another change. Change-Id: I5318de88b569085f26212e960b79048e8a2481a8 CRs-Fixed: 2076521 --- core/hdd/src/wlan_hdd_cfg80211.c | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 2d06abe1460f..5515f07dbaeb 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -112,6 +112,44 @@ #include "wlan_utility.h" #include "wlan_reg_ucfg_api.h" +/* define short names for get station info attributes */ +#ifndef LINK_INFO_STANDARD_NL80211_ATTR +#define LINK_INFO_STANDARD_NL80211_ATTR \ + QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_LINK_STANDARD_NL80211_ATTR +#endif +#ifndef AP_INFO_STANDARD_NL80211_ATTR +#define AP_INFO_STANDARD_NL80211_ATTR \ + QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_AP_STANDARD_NL80211_ATTR +#endif +#ifndef INFO_ROAM_COUNT +#define INFO_ROAM_COUNT \ + QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_ROAM_COUNT +#endif +#ifndef INFO_AKM +#define INFO_AKM \ + QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_AKM +#endif +#ifndef WLAN802_11_MODE +#define WLAN802_11_MODE \ + QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_802_11_MODE +#endif +#ifndef AP_INFO_HS20_INDICATION +#define AP_INFO_HS20_INDICATION \ + QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_AP_HS20_INDICATION +#endif +#ifndef HT_OPERATION +#define HT_OPERATION \ + QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_HT_OPERATION +#endif +#ifndef VHT_OPERATION +#define VHT_OPERATION \ + QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_VHT_OPERATION +#endif +#ifndef INFO_ASSOC_FAIL_REASON +#define INFO_ASSOC_FAIL_REASON \ + QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_ASSOC_FAIL_REASON +#endif + #define g_mode_rates_size (12) #define a_mode_rates_size (8) #define GET_IE_LEN_IN_BSS_DESC(lenInBss) (lenInBss + sizeof(lenInBss) - \