A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-24 21:54:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Fix build errors generated by gcc 6

Browse source 
Gcc 6 introduces some stricter checking for indentation,
causing warnings of misleading-indentation, which are
treated as build errors when drivers are compiled.

Fix all the identation warnings under qcacld-3.0.

Change-Id: Ie197761cfe4334ab14d593adebc56375372ba37c
CRs-Fixed: 2058158
This commit is contained in:
wadesong 2017-06-08 14:11:21 +08:00 • committed by snandini
commit 42968e93c3
5 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/bmi/src/ol_fw.c
View file

@ -1334,16 +1334,16 @@ QDF_STATUS ol_download_firmware(struct ol_context *ol_ctx)
case QCA9379_REV1_VERSION:
case AR6320_REV4_VERSION:
case AR6320_DEV_VERSION:
/*
* In sdio interface chip, both sdio_data2 and uart_tx pin
* will use GPIO6. It is set by fw rom code, which will cause
* sdio CRC error when there is sdio transaction.
* Override uart tx pin to avoid side effect to sdio pin.
*/
if (hif_get_bus_type(scn) == QDF_BUS_TYPE_SDIO)
param = 19;
else
param = 6;
/*
* In sdio interface chip, both sdio_data2 and uart_tx pin
* will use GPIO6. It is set by fw rom code, which will cause
* sdio CRC error when there is sdio transaction.
* Override uart tx pin to avoid side effect to sdio pin.
*/
if (hif_get_bus_type(scn) == QDF_BUS_TYPE_SDIO)
param = 19;
else
param = 6;
break;
default:
/* Configure GPIO AR9888 UART */

7
core/hdd/src/wlan_hdd_assoc.c
View file

@ -510,10 +510,10 @@ static void hdd_copy_ht_caps(hdd_station_ctx_t *hdd_sta_ctx,
for (i = 0; i < IEEE80211_HT_MCS_MASK_LEN; ++i)
hdd_ht_cap->mcs.rx_mask[i] =
roam_ht_cap->supportedMCSSet[i];
hdd_ht_cap->mcs.rx_highest =
hdd_ht_cap->mcs.rx_highest =
((short) (roam_ht_cap->supportedMCSSet[11]) << 8) |
((short) (roam_ht_cap->supportedMCSSet[10]));
hdd_ht_cap->mcs.tx_params =
hdd_ht_cap->mcs.tx_params =
roam_ht_cap->supportedMCSSet[12];
}
@ -554,7 +554,7 @@ static void hdd_copy_vht_caps(hdd_station_ctx_t *hdd_sta_ctx,
temp_vht_cap = roam_vht_cap->supportedChannelWidthSet &
(IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK >>
VHT_CAP_SUPP_CHAN_WIDTH_MASK_SHIFT);
if (temp_vht_cap)
if (temp_vht_cap) {
if (roam_vht_cap->supportedChannelWidthSet &
(IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ >>
VHT_CAP_SUPP_CHAN_WIDTH_MASK_SHIFT))
@ -567,6 +567,7 @@ static void hdd_copy_vht_caps(hdd_station_ctx_t *hdd_sta_ctx,
hdd_vht_cap->vht_cap_info |=
temp_vht_cap <<
IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ;
}
if (roam_vht_cap->ldpcCodingCap)
hdd_vht_cap->vht_cap_info |= IEEE80211_VHT_CAP_RXLDPC;
if (roam_vht_cap->shortGI80MHz)

2
core/hdd/src/wlan_hdd_main.c
View file

@ -9289,7 +9289,7 @@ static void hdd_state_info_dump(char **buf_ptr, uint16_t *size)
if (adapter->dev)
len += scnprintf(buf + len, *size - len,
"\n device name: %s", adapter->dev->name);
len += scnprintf(buf + len, *size - len,
len += scnprintf(buf + len, *size - len,
"\n device_mode: %d", adapter->device_mode);
switch (adapter->device_mode) {
case QDF_STA_MODE:

24
core/mac/src/pe/lim/lim_process_sme_req_messages.c
View file

@ -2731,23 +2731,23 @@ static void __lim_process_sme_deauth_req(tpAniSirGlobal mac_ctx,
ret_code = eSIR_SME_STA_NOT_AUTHENTICATED;
deauth_trigger = eLIM_HOST_DEAUTH;
/*
* here we received deauth request from AP so sme state
* is eLIM_SME_WT_DEAUTH_STATE.if we have ISSUED
* delSta then mlm state should be
* eLIM_MLM_WT_DEL_STA_RSP_STATE and ifwe got delBSS
* rsp then mlm state should be eLIM_MLM_IDLE_STATE
* so the below condition captures the state where
* delSta not done and firmware still in
* connected state.
*/
if (session_entry->limSmeState ==
/*
* here we received deauth request from AP so
* sme state is eLIM_SME_WT_DEAUTH_STATE.if we
* have ISSUED delSta then mlm state should be
* eLIM_MLM_WT_DEL_STA_RSP_STATE and ifwe got
* delBSS rsp then mlm state should be
* eLIM_MLM_IDLE_STATE so the below condition
* captures the state where delSta not done
* and firmware still in connected state.
*/
if (session_entry->limSmeState ==
eLIM_SME_WT_DEAUTH_STATE &&
session_entry->limMlmState !=
eLIM_MLM_IDLE_STATE &&
session_entry->limMlmState !=
eLIM_MLM_WT_DEL_STA_RSP_STATE)
ret_code = eSIR_SME_DEAUTH_STATUS;
ret_code = eSIR_SME_DEAUTH_STATUS;
goto send_deauth;
}
return;

19
core/mac/src/pe/lim/lim_utils.c
View file

@ -3835,26 +3835,27 @@ static void lim_handle_ht20coexist_ht20protection(tpAniSirGlobal mac_ctx,
*/
(eSIR_HT_OP_MODE_OVERLAP_LEGACY ==
session_entry->htOperMode)) {
if (session_entry->gLimHt20Params.
protectionEnabled) {
if (session_entry->gLimHt20Params.
protectionEnabled) {
if (eHT_CHANNEL_WIDTH_20MHZ ==
session_entry->htSupportedChannelWidthSet)
session_entry->
htSupportedChannelWidthSet)
session_entry->htOperMode =
eSIR_HT_OP_MODE_PURE;
else
session_entry->htOperMode =
eSIR_HT_OP_MODE_NO_LEGACY_20MHZ_HT;
lim_enable_ht_rifs_protection(mac_ctx,
lim_enable_ht_rifs_protection(mac_ctx,
false, overlap, beaconparams,
session_entry);
lim_enable_ht_obss_protection(mac_ctx,
lim_enable_ht_obss_protection(mac_ctx,
false, overlap, beaconparams,
session_entry);
} else {
session_entry->htOperMode =
eSIR_HT_OP_MODE_PURE;
}
} else {
session_entry->htOperMode =
eSIR_HT_OP_MODE_PURE;
}
}
} else if (LIM_IS_AP_ROLE(session_entry) && !overlap) {
/* Disable protection from 11G stations. */