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-12 07:37:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Fix compiler issuse when LFR disabled

Browse source 
Clean the compiler issue when CONFIG_QCACLD_WLAN_LFR3
or CONFIG_QCACLD_WLAN_LFR2 or both sets to 'N'.

Change-Id: I9fbad33883fcaf9c3f5728a96cac18bd18c2d14a
CRs-Fixed: 2159431
This commit is contained in:
Paul Zhang 2018-01-09 16:38:20 +08:00 • committed by snandini
commit c3fc0a8021
6 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/mac/src/pe/lim/lim_ft.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@ -478,7 +478,7 @@ void lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac,
}
#endif
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
#if defined(WLAN_FEATURE_ROAM_OFFLOAD)
/**
* lim_fill_dot11mode() - to fill 802.11 mode in FT session
* @mac_ctx: pointer to mac ctx
@ -505,7 +505,7 @@ static void lim_fill_dot11mode(tpAniSirGlobal mac_ctx,
pftSessionEntry->dot11mode = self_dot11_mode;
}
}
#else
#elif defined(WLAN_FEATURE_HOST_ROAM)
/**
* lim_fill_dot11mode() - to fill 802.11 mode in FT session
* @mac_ctx: pointer to mac ctx

2
core/sme/inc/csr_api.h
View file

@ -91,9 +91,7 @@ typedef enum {
eCSR_ENCRYPT_TYPE_WPI,
#endif /* FEATURE_WLAN_WAPI */
eCSR_ENCRYPT_TYPE_KRK,
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
eCSR_ENCRYPT_TYPE_BTK,
#endif
#ifdef WLAN_FEATURE_11W
/* 11w BIP */
eCSR_ENCRYPT_TYPE_AES_CMAC,

4
core/sme/inc/sme_api.h
View file

@ -1551,6 +1551,8 @@ QDF_STATUS sme_get_beacon_frm(tHalHandle hal, tCsrRoamProfile *profile,
const tSirMacAddr bssid,
uint8_t **frame_buf, uint32_t *frame_len,
int *channel);
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
/**
* sme_fast_reassoc() - invokes FAST REASSOC command
* @hal: handle returned by mac_open
@ -1565,7 +1567,7 @@ QDF_STATUS sme_get_beacon_frm(tHalHandle hal, tCsrRoamProfile *profile,
QDF_STATUS sme_fast_reassoc(tHalHandle hal, tCsrRoamProfile *profile,
const tSirMacAddr bssid, int channel,
uint8_t vdev_id, const tSirMacAddr connected_bssid);
#endif
/**
* sme_congestion_register_callback(): registers congestion callback
* @hal: handler for HAL

2
core/sme/src/common/sme_api.c
View file

@ -15117,6 +15117,7 @@ free_scan_flter:
return status;
}
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
QDF_STATUS sme_fast_reassoc(tHalHandle hal, tCsrRoamProfile *profile,
const tSirMacAddr bssid, int channel,
uint8_t vdev_id, const tSirMacAddr connected_bssid)
@ -15183,6 +15184,7 @@ QDF_STATUS sme_fast_reassoc(tHalHandle hal, tCsrRoamProfile *profile,
return status;
}
#endif
QDF_STATUS sme_set_del_pmkid_cache(tHalHandle hal, uint8_t session_id,
tPmkidCacheInfo *pmk_cache_info,

3
core/sme/src/csr/csr_api_roam.c
View file

@ -1900,6 +1900,8 @@ QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac,
return status;
}
#if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
/**
* csr_fetch_ch_lst_from_received_list() - fetch channel list from received list
* and update req msg
@ -1975,6 +1977,7 @@ csr_fetch_ch_lst_from_received_list(tpAniSirGlobal mac_ctx,
req_buf->ConnectedNetwork.ChannelCount = num_channels;
req_buf->ChannelCacheType = CHANNEL_LIST_DYNAMIC_UPDATE;
}
#endif
/**
* csr_set_cckm_ie() - set CCKM IE

3
core/wma/src/wma_dev_if.c
View file

@ -5161,7 +5161,8 @@ static void wma_wait_tx_complete(tp_wma_handle wma,
}
}
#else
static void wma_wait_tx_complete(tp_wma_handle wma)
static void wma_wait_tx_complete(tp_wma_handle wma,
uint32_t session_id)
{
}
#endif