From 573db4b40c8342cd58f3adbd5069a9d836338c36 Mon Sep 17 00:00:00 2001 From: Will Huang Date: Thu, 5 Mar 2020 10:51:33 +0800 Subject: [PATCH] qcacld-3.0: Add policy attribute to hdd_wiphy_vendor_commands According to new changes in kernel 5.4 version onwards, driver has to provide the policy for a NL command to ve verified against while registering wiphy to the kernel. To accommodate these changes, add policy for all the following vendor commands that are being registered in the driver QCA_NL80211_VENDOR_SUBCMD_DO_ACS QCA_NL80211_VENDOR_SUBCMD_GET_FEATURES Change-Id: I56d685cf3d7bab8f758d52b2e5d3c0a735accb26 CRs-Fixed: 2635226 --- core/hdd/src/wlan_hdd_cfg80211.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index b938ace1129f..b912b2079761 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -2674,7 +2674,7 @@ static int hdd_create_acs_timer(struct hdd_adapter *adapter) } static const struct nla_policy -wlan_hdd_cfg80211_do_acs_policy[QCA_WLAN_VENDOR_ATTR_ACS_MAX+1] = { +wlan_hdd_cfg80211_do_acs_policy[QCA_WLAN_VENDOR_ATTR_ACS_MAX + 1] = { [QCA_WLAN_VENDOR_ATTR_ACS_HW_MODE] = { .type = NLA_U8 }, [QCA_WLAN_VENDOR_ATTR_ACS_HT_ENABLED] = { .type = NLA_FLAG }, [QCA_WLAN_VENDOR_ATTR_ACS_HT40_ENABLED] = { .type = NLA_FLAG }, @@ -14505,7 +14505,9 @@ const struct wiphy_vendor_command hdd_wiphy_vendor_commands[] = { .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, - .doit = wlan_hdd_cfg80211_do_acs + .doit = wlan_hdd_cfg80211_do_acs, + vendor_command_policy(wlan_hdd_cfg80211_do_acs_policy, + QCA_WLAN_VENDOR_ATTR_ACS_MAX) }, {