diff options
| author | Vignesh Viswanathan <viswanat@codeaurora.org> | 2017-10-24 23:15:40 +0530 |
|---|---|---|
| committer | snandini <snandini@codeaurora.org> | 2017-10-24 16:01:10 -0700 |
| commit | 3bc65ef9201c0715f2d1becbf0fa3b211325a2b5 (patch) | |
| tree | efd48a6330e12e701bd13b4e287b773cffed4745 | |
| parent | 5953d2718a9c029b8d0d41873b1b0626c3d1c6c2 (diff) | |
qcacld-3.0: Fix insmod failure due to hdd_update_hlp_info
When using kernel versions less than 4.12. insmod fails due to
Unknown symbol hdd_update_hlp_info. This is due to missing kernel version
check for declaration of hdd_update_hlp_info.
Moved declaration of hdd_update_hlp_info under appropriate kernel version
checks.
Also removed an unused function causing build failure if FILS is disabled
in Kbuild
Change-Id: Ie057210e2c26c51ad1c92a4ed1ee84146bb2cb33
CRs-Fixed: 2131750
| -rw-r--r-- | core/hdd/inc/wlan_hdd_main.h | 34 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_cfg80211.c | 6 |
2 files changed, 16 insertions, 24 deletions
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 0a19d551c46a..435a891952ed 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -2719,9 +2719,25 @@ void hdd_chip_pwr_save_fail_detected_cb(void *hdd_ctx, * Return: None */ void hdd_clear_fils_connection_info(hdd_adapter_t *adapter); + +/** + * hdd_update_hlp_info() - Update HLP packet received in FILS (re)assoc rsp + * @dev: net device + * @roam_fils_params: Fils join rsp params + * + * This API is used to send the received HLP packet in Assoc rsp(FILS AKM) + * to the network layer. + * + * Return: None + */ +void hdd_update_hlp_info(struct net_device *dev, tCsrRoamInfo *roam_info); #else static inline void hdd_clear_fils_connection_info(hdd_adapter_t *adapter) { } + +static inline void hdd_update_hlp_info(struct net_device *dev, + tCsrRoamInfo *roam_info) +{} #endif /** @@ -2765,24 +2781,6 @@ int hdd_set_limit_off_chan_for_tos(hdd_adapter_t *adapter, enum tos tos, */ int hdd_reset_limit_off_chan(hdd_adapter_t *adapter); -#if defined(WLAN_FEATURE_FILS_SK) -/** - * hdd_update_hlp_info() - Update HLP packet received in FILS (re)assoc rsp - * @dev: net device - * @roam_fils_params: Fils join rsp params - * - * This API is used to send the received HLP packet in Assoc rsp(FILS AKM) - * to the network layer. - * - * Return: None - */ -void hdd_update_hlp_info(struct net_device *dev, tCsrRoamInfo *roam_info); -#else -static inline void hdd_update_hlp_info(struct net_device *dev, - tCsrRoamInfo *roam_info) -{} -#endif - #undef nla_parse #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) static inline void hdd_dev_setup_destructor(struct net_device *dev) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 3fc6fbb8d97d..c48638f9ed59 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -15956,12 +15956,6 @@ static bool wlan_hdd_is_conn_type_fils(struct cfg80211_connect_params *req) return true; } #else -static enum eAniAuthType wlan_hdd_get_fils_auth_type( - enum nl80211_auth_type auth) -{ - return eSIR_DONOT_USE_AUTH_TYPE; -} - static int wlan_hdd_cfg80211_set_fils_config(struct hdd_adapter_s *adapter, struct cfg80211_connect_params *req) { |