From b62dd89f574a97c0e4dc3402fae0381e66d8132c Mon Sep 17 00:00:00 2001 From: Shwetha G K Date: Tue, 10 Oct 2023 11:01:03 +0530 Subject: [PATCH] qcacmn: Handle compilation for 6.5-rc3 kernel backport Changes to fix the compilation error seen with kernel version 6.5-rc3 backports. WEP KEYS support is removed in this kernel, hence handle the same. CRs-Fixed: 3623998 Change-Id: Ibf8423351eb4645f8d8a4a94bbe249fe96971287 --- os_if/linux/mlme/src/osif_cm_req.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/os_if/linux/mlme/src/osif_cm_req.c b/os_if/linux/mlme/src/osif_cm_req.c index f9884cc57e..7d4b1c08c4 100644 --- a/os_if/linux/mlme/src/osif_cm_req.c +++ b/os_if/linux/mlme/src/osif_cm_req.c @@ -39,7 +39,8 @@ #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) && \ -LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0) +LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0) && \ +!defined(CFG80211_CRYPTO_WEP_KEYS_REMOVED) static QDF_STATUS osif_cm_update_wep_seq_info(struct wlan_cm_connect_req *connect_req, const struct cfg80211_connect_params *req) @@ -68,6 +69,7 @@ osif_cm_update_wep_seq_info(struct wlan_cm_connect_req *connect_req, } #endif +#if !defined(CFG80211_CRYPTO_WEP_KEYS_REMOVED) static QDF_STATUS osif_cm_set_wep_key_params(struct wlan_cm_connect_req *connect_req, const struct cfg80211_connect_params *req) @@ -88,6 +90,14 @@ osif_cm_set_wep_key_params(struct wlan_cm_connect_req *connect_req, return osif_cm_update_wep_seq_info(connect_req, req); } +#else +static QDF_STATUS +osif_cm_set_wep_key_params(struct wlan_cm_connect_req *connect_req, + const struct cfg80211_connect_params *req) +{ + return QDF_STATUS_SUCCESS; +} +#endif static void osif_cm_set_auth_type(struct wlan_cm_connect_req *connect_req, const struct cfg80211_connect_params *req)