samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Fix compilation errors in extscan vendor cmd policy

Browse Source 
Issue1:Compilation fails when CONFIG_FEATURE_WLAN_EXTSCAN
is enabled as the latest kernels(>=5.2) expect
two params(policy and maxattr) as vendor_command_policy
whereas vendor_command_policy is empty for old kernel.
When the macro FEATURE_EXTSCAN_VENDOR_COMMANDS is
replaced, it results in a compilation error as
the comma is missing between vendor_command_policy
and the previous param for latest kernel.

Fix1:Add a comma between vendor_command_policy and
the previous param(.doit) to make it compilable
for newer kernels as well.

Issue2:As part of recent code changes
all occurrences of  blacklist/whitelist replaces to
denylist/allowlist in the driver.
which replaced interface structure member in the driver,
without changing actual definition of interface structure,
causes compilation error.

Fix2:Rename to actual structure member names.

Change-Id: I0024de7bf237c13297ed9a088a73a9f5c6a78d17
CRs-Fixed: 3370114
This commit is contained in:
Divyajyothi Goparaju
2022-12-29 16:04:38 +05:30
committed by Madan Koyyalamudi
parent ad423f816a
commit 30fcd43512
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/hdd/src/wlan_hdd_ext_scan.c
View File

@@ -1,6 +1,6 @@
/* /*
* Copyright (c) 2012-2021 The Linux Foundation. All rights reserved. * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -1487,9 +1487,9 @@ static int wlan_hdd_send_ext_scan_capability(struct hdd_context *hdd_ctx)
data->max_number_epno_networks) || data->max_number_epno_networks) ||
nla_put_u32(skb, MAX_NUM_EPNO_NETS_BY_SSID, nla_put_u32(skb, MAX_NUM_EPNO_NETS_BY_SSID,
data->max_number_epno_networks_by_ssid) || data->max_number_epno_networks_by_ssid) ||
nla_put_u32(skb, MAX_NUM_ALLOWLISTED_SSID, nla_put_u32(skb, MAX_NUM_WHITELISTED_SSID,
data->max_number_of_allow_listed_ssid) || data->max_number_of_allow_listed_ssid) ||
nla_put_u32(skb, MAX_NUM_DENYLISTED_BSSID, nla_put_u32(skb, MAX_NUM_BLACKLISTED_BSSID,
data->max_number_of_deny_listed_bssid)) { data->max_number_of_deny_listed_bssid)) {
hdd_err("nla put fail"); hdd_err("nla put fail");
goto nla_put_failure; goto nla_put_failure;

22
core/hdd/src/wlan_hdd_scan.h
View File

@@ -1,6 +1,6 @@
/* /*
* Copyright (c) 2012-2021 The Linux Foundation. All rights reserved. * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -160,7 +160,7 @@ wlan_hdd_pno_config_policy[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1];
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_STOP, \ .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_STOP, \
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | \ .flags = WIPHY_VENDOR_CMD_NEED_WDEV | \
WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \ WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \
.doit = wlan_hdd_cfg80211_extscan_stop \ .doit = wlan_hdd_cfg80211_extscan_stop, \
vendor_command_policy(wlan_hdd_extscan_config_policy, \ vendor_command_policy(wlan_hdd_extscan_config_policy, \
EXTSCAN_PARAM_MAX) \ EXTSCAN_PARAM_MAX) \
}, \ }, \
@@ -169,7 +169,7 @@ wlan_hdd_pno_config_policy[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1];
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_GET_CAPABILITIES, \ .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_GET_CAPABILITIES, \
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | \ .flags = WIPHY_VENDOR_CMD_NEED_WDEV | \
WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \ WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \
.doit = wlan_hdd_cfg80211_extscan_get_capabilities \ .doit = wlan_hdd_cfg80211_extscan_get_capabilities, \
vendor_command_policy(wlan_hdd_extscan_config_policy, \ vendor_command_policy(wlan_hdd_extscan_config_policy, \
EXTSCAN_PARAM_MAX) \ EXTSCAN_PARAM_MAX) \
}, \ }, \
@@ -178,7 +178,7 @@ wlan_hdd_pno_config_policy[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1];
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_GET_CACHED_RESULTS, \ .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_GET_CACHED_RESULTS, \
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | \ .flags = WIPHY_VENDOR_CMD_NEED_WDEV | \
WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \ WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \
.doit = wlan_hdd_cfg80211_extscan_get_cached_results \ .doit = wlan_hdd_cfg80211_extscan_get_cached_results, \
vendor_command_policy(wlan_hdd_extscan_config_policy, \ vendor_command_policy(wlan_hdd_extscan_config_policy, \
EXTSCAN_PARAM_MAX) \ EXTSCAN_PARAM_MAX) \
}, \ }, \
@@ -187,7 +187,7 @@ wlan_hdd_pno_config_policy[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1];
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SET_BSSID_HOTLIST, \ .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SET_BSSID_HOTLIST, \
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | \ .flags = WIPHY_VENDOR_CMD_NEED_WDEV | \
WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \ WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \
.doit = wlan_hdd_cfg80211_extscan_set_bssid_hotlist \ .doit = wlan_hdd_cfg80211_extscan_set_bssid_hotlist, \
vendor_command_policy(wlan_hdd_extscan_config_policy, \ vendor_command_policy(wlan_hdd_extscan_config_policy, \
EXTSCAN_PARAM_MAX) \ EXTSCAN_PARAM_MAX) \
}, \ }, \
@@ -196,7 +196,7 @@ wlan_hdd_pno_config_policy[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1];
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_RESET_BSSID_HOTLIST, \ .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_RESET_BSSID_HOTLIST, \
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | \ .flags = WIPHY_VENDOR_CMD_NEED_WDEV | \
WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \ WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \
.doit = wlan_hdd_cfg80211_extscan_reset_bssid_hotlist \ .doit = wlan_hdd_cfg80211_extscan_reset_bssid_hotlist, \
vendor_command_policy(wlan_hdd_extscan_config_policy, \ vendor_command_policy(wlan_hdd_extscan_config_policy, \
EXTSCAN_PARAM_MAX) \ EXTSCAN_PARAM_MAX) \
}, \ }, \
@@ -206,7 +206,7 @@ wlan_hdd_pno_config_policy[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1];
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SET_SIGNIFICANT_CHANGE, \ QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SET_SIGNIFICANT_CHANGE, \
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | \ .flags = WIPHY_VENDOR_CMD_NEED_WDEV | \
WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \ WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \
.doit = wlan_hdd_cfg80211_extscan_set_significant_change \ .doit = wlan_hdd_cfg80211_extscan_set_significant_change, \
vendor_command_policy(wlan_hdd_extscan_config_policy, \ vendor_command_policy(wlan_hdd_extscan_config_policy, \
EXTSCAN_PARAM_MAX) \ EXTSCAN_PARAM_MAX) \
}, \ }, \
@@ -216,7 +216,7 @@ wlan_hdd_pno_config_policy[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1];
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_RESET_SIGNIFICANT_CHANGE, \ QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_RESET_SIGNIFICANT_CHANGE, \
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | \ .flags = WIPHY_VENDOR_CMD_NEED_WDEV | \
WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \ WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \
.doit = wlan_hdd_cfg80211_extscan_reset_significant_change \ .doit = wlan_hdd_cfg80211_extscan_reset_significant_change, \
vendor_command_policy(wlan_hdd_extscan_config_policy, \ vendor_command_policy(wlan_hdd_extscan_config_policy, \
EXTSCAN_PARAM_MAX) \ EXTSCAN_PARAM_MAX) \
}, \ }, \
@@ -225,7 +225,7 @@ wlan_hdd_pno_config_policy[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1];
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_PNO_SET_LIST, \ .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_PNO_SET_LIST, \
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | \ .flags = WIPHY_VENDOR_CMD_NEED_WDEV | \
WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \ WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \
.doit = wlan_hdd_cfg80211_set_epno_list \ .doit = wlan_hdd_cfg80211_set_epno_list, \
vendor_command_policy(wlan_hdd_pno_config_policy, \ vendor_command_policy(wlan_hdd_pno_config_policy, \
QCA_WLAN_VENDOR_ATTR_PNO_MAX) \ QCA_WLAN_VENDOR_ATTR_PNO_MAX) \
}, \ }, \
@@ -235,7 +235,7 @@ wlan_hdd_pno_config_policy[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1];
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_PNO_SET_PASSPOINT_LIST, \ QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_PNO_SET_PASSPOINT_LIST, \
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | \ .flags = WIPHY_VENDOR_CMD_NEED_WDEV | \
WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \ WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \
.doit = wlan_hdd_cfg80211_set_passpoint_list \ .doit = wlan_hdd_cfg80211_set_passpoint_list, \
vendor_command_policy(wlan_hdd_pno_config_policy, \ vendor_command_policy(wlan_hdd_pno_config_policy, \
QCA_WLAN_VENDOR_ATTR_PNO_MAX) \ QCA_WLAN_VENDOR_ATTR_PNO_MAX) \
}, \ }, \
@@ -245,7 +245,7 @@ wlan_hdd_pno_config_policy[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1];
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_PNO_RESET_PASSPOINT_LIST, \ QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_PNO_RESET_PASSPOINT_LIST, \
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | \ .flags = WIPHY_VENDOR_CMD_NEED_WDEV | \
WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \ WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, \
.doit = wlan_hdd_cfg80211_reset_passpoint_list \ .doit = wlan_hdd_cfg80211_reset_passpoint_list, \
vendor_command_policy(wlan_hdd_pno_config_policy, \ vendor_command_policy(wlan_hdd_pno_config_policy, \
QCA_WLAN_VENDOR_ATTR_PNO_MAX) \ QCA_WLAN_VENDOR_ATTR_PNO_MAX) \
}, },

6
core/wma/src/wma_scan_roam.c
View File

@@ -1,6 +1,6 @@
/* /*
* Copyright (c) 2013-2021 The Linux Foundation. All rights reserved. * Copyright (c) 2013-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -1435,9 +1435,9 @@ int wma_extscan_capabilities_event_handler(void *handle,
dest_capab->max_number_epno_networks_by_ssid = dest_capab->max_number_epno_networks_by_ssid =
event->num_epno_networks; event->num_epno_networks;
dest_capab->max_number_of_allow_listed_ssid = dest_capab->max_number_of_allow_listed_ssid =
event->num_roam_ssid_allowlist; event->num_roam_ssid_whitelist;
dest_capab->max_number_of_deny_listed_bssid = dest_capab->max_number_of_deny_listed_bssid =
event->num_roam_bssid_denylist; event->num_roam_bssid_blacklist;
dest_capab->status = 0; dest_capab->status = 0;
wma_debug("request_id: %u status: %d", wma_debug("request_id: %u status: %d",