From 348c43296350e8c269dd38b5522f53c4b21e875f Mon Sep 17 00:00:00 2001 From: Aravind Kishore Sukla Date: Tue, 1 Aug 2023 14:54:21 +0530 Subject: [PATCH] qcacmn: Enable CFG80211_MULTI_AKM_CONNECT_SUPPORT from kernelv6.0 Current code supports CFG80211_MULTI_AKM_CONNECT_SUPPORT only for v5.15 kernel. Enable this feature support from kernelv6.0 by default. Change-Id: Ie0d36c6e6d286a432bcaa99ee905858e70297ba1 CRs-Fixed: 3577264 --- os_if/linux/wlan_osif_features.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/os_if/linux/wlan_osif_features.h b/os_if/linux/wlan_osif_features.h index 69fea890f8..46c6a3304e 100644 --- a/os_if/linux/wlan_osif_features.h +++ b/os_if/linux/wlan_osif_features.h @@ -134,12 +134,12 @@ * used to indicate the Linux kernel contains support for multi AKM connect * support * - * This feature was backported to Android Common Kernel 5.15 via: - * https://android-review.googlesource.com/c/kernel/common/+/2115619 + * This feature was introduced in Linux Kernel 6.0 via: + * ecad3b0b99bf wifi: cfg80211: Increase akm_suites array size in + * cfg80211_crypto_settings. */ -#if (defined(__ANDROID_COMMON_KERNEL__) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)) && \ - (LINUX_VERSION_CODE < KERNEL_VERSION(5, 16, 0))) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) || \ + (defined CFG80211_MAX_NUM_AKM_SUITES)) #define CFG80211_MULTI_AKM_CONNECT_SUPPORT 1 #endif