From 8e7ecabe16c8552f9400c53fd3e634ac8d222fe1 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 16 May 2019 11:31:19 -0700 Subject: [PATCH] qcacld-3.0: Replace IE_EID_VENDOR with WLAN_ELEMID_VENDOR Replace IE_EID_VENDOR with converged macro WLAN_ELEMID_VENDOR. Change-Id: I7f3109f8e2413d4ad091bebbd377739ff5c1e74d CRs-Fixed: 2454262 --- core/hdd/src/wlan_hdd_cfg80211.c | 2 +- core/hdd/src/wlan_hdd_hostapd.c | 2 +- core/hdd/src/wlan_hdd_ioctl.c | 4 ++-- core/hdd/src/wlan_hdd_scan.c | 2 +- core/mac/inc/ani_global.h | 3 --- core/mac/src/pe/lim/lim_send_management_frames.c | 2 +- core/mac/src/pe/lim/lim_utils.c | 2 +- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index c7f48a627fbe..3bb160ad5a60 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -5460,7 +5460,7 @@ static QDF_STATUS wlan_hdd_add_qcn_ie(uint8_t *ie_data, uint16_t *ie_len) { tDot11fIEQCN_IE qcn_ie; uint8_t qcn_ie_hdr[QCN_IE_HDR_LEN] - = {IE_EID_VENDOR, DOT11F_IE_QCN_IE_MAX_LEN, + = {WLAN_ELEMID_VENDOR, DOT11F_IE_QCN_IE_MAX_LEN, 0x8C, 0xFD, 0xF0, 0x1}; if (((*ie_len) + QCN_IE_HDR_LEN + diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index bec188120552..9aef1c080a78 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -3838,7 +3838,7 @@ static void wlan_hdd_add_hostapd_conf_vsie(struct hdd_adapter *adapter, elem_id, elem_len, left); return; } - if (IE_EID_VENDOR == elem_id) { + if (WLAN_ELEMID_VENDOR == elem_id) { /* * skipping the Vendor IE's which we don't want to * include or it will be included by existing code. diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 71705507a856..94978ff49106 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -4717,7 +4717,7 @@ static int hdd_parse_set_ibss_oui_data_command(uint8_t *command, uint8_t *ie, limit -= 2; } - ie[0] = IE_EID_VENDOR; + ie[0] = WLAN_ELEMID_VENDOR; ie[1] = len - 2; return len; @@ -4806,7 +4806,7 @@ static int drv_cmd_set_ibss_beacon_oui_data(struct hdd_adapter *adapter, modify_ie.smeSessionId = adapter->vdev_id; modify_ie.notify = true; - modify_ie.ieID = IE_EID_VENDOR; + modify_ie.ieID = WLAN_ELEMID_VENDOR; modify_ie.ieIDLen = ibss_ie_length; modify_ie.ieBufferlength = ibss_ie_length; modify_ie.pIEBuffer = ibss_ie; diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 9dea285047ba..4646d0a2a0f6 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -362,7 +362,7 @@ static int wlan_hdd_update_scan_ies(struct hdd_adapter *adapter, scan_ie, *scan_ie_len)) add_ie = true; break; - case IE_EID_VENDOR: + case WLAN_ELEMID_VENDOR: if ((0 != qdf_mem_cmp(&temp_ie[0], MBO_OUI_TYPE, MBO_OUI_TYPE_SIZE)) || (0 == qdf_mem_cmp(&temp_ie[0], QCN_OUI_TYPE, diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index e807720dabaa..3b352ee4cfe3 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -105,9 +105,6 @@ static inline mac_handle_t MAC_HANDLE(struct mac_context *mac) #define HIGH_SEQ_NUM_OFFSET 4 #define DEF_HE_AUTO_SGI_LTF 0x0F07 -/* vendor element ID */ -#define IE_EID_VENDOR (221) /* 0xDD */ - /** * enum log_event_type - Type of event initiating bug report * @WLAN_LOG_TYPE_NON_FATAL: Non fatal event diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index d899a2ee7b2a..57cc96509467 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -1590,7 +1590,7 @@ static QDF_STATUS lim_fill_adaptive_11r_ie(struct pe_session *pe_session, /* Fill the Vendor IE Type (0xDD) */ buf = adaptive_11r_ie; - *buf = IE_EID_VENDOR; + *buf = WLAN_ELEMID_VENDOR; buf++; /* Fill the Vendor IE length (0x0B) */ diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 2e00f658237e..9bf804b64ba2 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -7563,7 +7563,7 @@ bool lim_check_if_vendor_oui_match(struct mac_context *mac_ctx, elem_id = *ie; - if (elem_id == IE_EID_VENDOR && + if (elem_id == WLAN_ELEMID_VENDOR && !qdf_mem_cmp(&ptr[2], oui, oui_len)) return true; else