lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Consolidate DS mode definitions

Browse Source 
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
This commit is contained in:
Jeff Johnson 2018-12-10 17:57:04 -08:00 committed by nshrivas
parent 06ff3be1eb
commit e866cac222
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/wma/inc/wma.h
View File

@ -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.

10
core/wma/src/wma_features.c
View File

@ -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,