From 6cbd4faef6fc4e21fc80258ebe73fcd2bd62e7fb Mon Sep 17 00:00:00 2001 From: Wu Gao Date: Sun, 15 Nov 2020 06:40:55 -0800 Subject: [PATCH] qcacld-3.0: Update nla policy about cfr configurations It uses policy of wlan host to check settings from user space in msm-5.4, which causes user application failed to trigger cfr vendor command. This change updates nla policy of cfr and let it compatible with msm-5.4. Change-Id: Ia7e9bb1e12b4e4f586abb650fe52a62292b0f11d CRs-Fixed: 2819321 --- core/hdd/src/wlan_hdd_cfr.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfr.c b/core/hdd/src/wlan_hdd_cfr.c index d7feb5770a23..48004420f14e 100644 --- a/core/hdd/src/wlan_hdd_cfr.c +++ b/core/hdd/src/wlan_hdd_cfr.c @@ -32,8 +32,8 @@ const struct nla_policy cfr_config_policy[ QCA_WLAN_VENDOR_ATTR_PEER_CFR_MAX + 1] = { - [QCA_WLAN_VENDOR_ATTR_CFR_PEER_MAC_ADDR] = { - .type = NLA_BINARY, .len = QDF_MAC_ADDR_SIZE}, + [QCA_WLAN_VENDOR_ATTR_CFR_PEER_MAC_ADDR] = + VENDOR_NLA_POLICY_MAC_ADDR, [QCA_WLAN_VENDOR_ATTR_PEER_CFR_ENABLE] = {.type = NLA_FLAG}, [QCA_WLAN_VENDOR_ATTR_PEER_CFR_BANDWIDTH] = {.type = NLA_U8}, [QCA_WLAN_VENDOR_ATTR_PEER_CFR_PERIODICITY] = {.type = NLA_U32}, @@ -49,15 +49,19 @@ const struct nla_policy cfr_config_policy[ [QCA_WLAN_VENDOR_ATTR_PEER_CFR_UL_MU_MASK] = {.type = NLA_U64}, [QCA_WLAN_VENDOR_ATTR_PEER_CFR_FREEZE_TLV_DELAY_COUNT] = { .type = NLA_U32}, + [QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_TABLE] = { + .type = NLA_NESTED}, + [QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_ENTRY] = { + .type = NLA_NESTED}, [QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_NUMBER] = {.type = NLA_U32}, - [QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_TA] = { - .type = NLA_BINARY, .len = QDF_MAC_ADDR_SIZE}, - [QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_RA] = { - .type = NLA_BINARY, .len = QDF_MAC_ADDR_SIZE}, - [QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_TA_MASK] = { - .type = NLA_BINARY, .len = QDF_MAC_ADDR_SIZE}, - [QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_RA_MASK] = { - .type = NLA_BINARY, .len = QDF_MAC_ADDR_SIZE}, + [QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_TA] = + VENDOR_NLA_POLICY_MAC_ADDR, + [QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_RA] = + VENDOR_NLA_POLICY_MAC_ADDR, + [QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_TA_MASK] = + VENDOR_NLA_POLICY_MAC_ADDR, + [QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_RA_MASK] = + VENDOR_NLA_POLICY_MAC_ADDR, [QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_NSS] = {.type = NLA_U32}, [QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_BW] = {.type = NLA_U32}, [QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_MGMT_FILTER] = {