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-17 10:12:28 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacld-3.0: Fix Compilation issues when FILS is disabled in Kbuild" into wlan-cld3.driver.lnx.2.0-dev

Browse source
This commit is contained in:
CNSS_WLAN Service 2017-10-19 17:35:35 -07:00 • committed by Gerrit - the friendly Code Review server
commit 14a3bcdf51
3 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2053,6 +2053,7 @@ static inline void hdd_send_roamed_ind(struct net_device *dev,
#endif
#if defined(WLAN_FEATURE_ROAM_OFFLOAD)
#if defined(WLAN_FEATURE_FILS_SK)
void hdd_save_gtk_params(struct hdd_adapter *adapter,
tCsrRoamInfo *csr_roam_info, bool is_reassoc)
{
@ -2077,6 +2078,26 @@ void hdd_save_gtk_params(struct hdd_adapter *adapter,
hdd_debug("Kek len %d", kek_len);
}
#else
void hdd_save_gtk_params(struct hdd_adapter *adapter,
tCsrRoamInfo *csr_roam_info, bool is_reassoc)
{
uint8_t *kek;
uint32_t kek_len;
/*
* is_reassoc is set to true always for Legacy GTK offload
* case, It is false only for FILS case
*/
kek = csr_roam_info->kek;
kek_len = csr_roam_info->kek_len;
wlan_hdd_save_gtk_offload_params(adapter, NULL, kek, kek_len,
csr_roam_info->replay_ctr, true);
hdd_debug("Kek len %d", kek_len);
}
#endif
#endif
/**
* hdd_send_re_assoc_event() - send reassoc event

2
core/mac/inc/sir_api.h
View file

@ -1320,8 +1320,8 @@ typedef struct sSirSmeJoinRsp {
tDot11fIEVHTOperation vht_operation;
tDot11fIEhs20vendor_ie hs20vendor_ie;
bool is_fils_connection;
#ifdef WLAN_FEATURE_FILS_SK
uint16_t fils_seq_num;
#ifdef WLAN_FEATURE_FILS_SK
struct fils_join_rsp_params *fils_join_rsp;
#endif
uint8_t frames[1];

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

@ -409,10 +409,8 @@ typedef struct tagCsrScanResultFilter {
struct sCsrChannel_ pcl_channels;
struct qdf_mac_addr bssid_hint;
enum tQDF_ADAPTER_MODE csrPersona;
#ifdef WLAN_FEATURE_FILS_SK
bool realm_check;
uint8_t fils_realm[2];
#endif
} tCsrScanResultFilter;
typedef struct sCsrChnPower_ {