From e866cac222b611115f0fc3a0e63ba5bd217b231c Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Mon, 10 Dec 2018 17:57:04 -0800 Subject: [PATCH] qcacld-3.0: Consolidate DS mode definitions The file cds_ieee80211_common.h contains a large number of macros that are used to describe most fields in IEEE 802.11 frames. Despite that, currently WMA has an enum ds_mode to represent the Distribution System Mode settings. In order to avoid unnecessary duplicate definitions remove enum ds_mode and instead use the cds_ieee80211_common macros. Change-Id: I0dc722009e063a1eac0da4afbe77f96772c583b2 CRs-Fixed: 2365060 --- core/wma/inc/wma.h | 14 -------------- core/wma/src/wma_features.c | 10 +++++----- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 3fb633e41b26..87761010dee9 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -152,20 +152,6 @@ #define WMA_BEACON_TX_RATE_48_M 480 #define WMA_BEACON_TX_RATE_54_M 540 -/** - * ds_mode: distribution system mode - * @IEEE80211_NO_DS: NO DS at either side - * @IEEE80211_TO_DS: DS at receiver side - * @IEEE80211_FROM_DS: DS at sender side - * @IEEE80211_DS_TO_DS: DS at both sender and revceiver side - */ -enum ds_mode { - IEEE80211_NO_DS, - IEEE80211_TO_DS, - IEEE80211_FROM_DS, - IEEE80211_DS_TO_DS -}; - /* Roaming default values * All time and period values are in milliseconds. * All rssi values are in dB except for WMA_NOISE_FLOOR_DBM_DEFAULT. diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 2fd8da68f298..d5084a3b6a62 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -2497,22 +2497,22 @@ static void wma_wow_dump_mgmt_buffer(uint8_t *wow_packet_buffer, wh->i_fc[1] & IEEE80211_FC1_DIR_TODS, wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS); - to_from_ds = wh->i_fc[1] & IEEE80211_FC1_DIR_DSTODS; + to_from_ds = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK; switch (to_from_ds) { - case IEEE80211_NO_DS: + case IEEE80211_FC1_DIR_NODS: WMA_LOGE("BSSID: " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(wh->i_addr3)); break; - case IEEE80211_TO_DS: + case IEEE80211_FC1_DIR_TODS: WMA_LOGE("DA: " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(wh->i_addr3)); break; - case IEEE80211_FROM_DS: + case IEEE80211_FC1_DIR_FROMDS: WMA_LOGE("SA: " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(wh->i_addr3)); break; - case IEEE80211_DS_TO_DS: + case IEEE80211_FC1_DIR_DSTODS: if (buf_len >= sizeof(struct ieee80211_frame_addr4)) WMA_LOGE("DA: " MAC_ADDRESS_STR " SA: " MAC_ADDRESS_STR,