diff options
| author | Hsiu-Chang Chen <hsiuchangchen@google.com> | 2022-05-30 13:27:13 +0800 |
|---|---|---|
| committer | Hsiu-Chang Chen <hsiuchangchen@google.com> | 2022-05-30 11:49:51 +0000 |
| commit | f5e4732af172f8261206050495f71de8f82e7d65 (patch) | |
| tree | fb8b82757f2f105df8dc683fda94c210d214b48d | |
| parent | 947c29ce0fbf65b0906a9a535cf2585d45ed7487 (diff) | |
| download | wlan-f5e4732af172f8261206050495f71de8f82e7d65.tar.gz | |
wifi_hal: Deprecate the attibute NDP_CONFIG_SECURITY
NDP_CONFIG_SECURITY is deprecated, use NCS_SK_TYPE/PMK/SCID
instead. Also, recent kernels have the strict rules to specify
the policy for each attribute of NL80211_CMD_VENDOR subcmd's.
Since, this attribute is not used by all variants of host
driver's, it is quite safer to rather remove this.
Bug: 234310602
Test: DataPathTest
Change-Id: Iba515093e125219fb865d05ffcd98ebfca0a0c53
CRs-fixed: 2762504
| -rw-r--r-- | qcwcn/wifi_hal/nan.cpp | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/qcwcn/wifi_hal/nan.cpp b/qcwcn/wifi_hal/nan.cpp index 934c46e..9e74cea 100644 --- a/qcwcn/wifi_hal/nan.cpp +++ b/qcwcn/wifi_hal/nan.cpp @@ -899,7 +899,7 @@ wifi_error nan_data_request_initiator(transaction_id id, { ALOGV("NAN_DP_REQUEST_INITIATOR"); wifi_error ret; - struct nlattr *nlData, *nlCfgSecurity, *nlCfgQos; + struct nlattr *nlData, *nlCfgQos; NanCommand *nanCommand = NULL; if (msg == NULL) @@ -970,19 +970,6 @@ wifi_error nan_data_request_initiator(transaction_id id, goto cleanup; } } - if (msg->ndp_cfg.security_cfg == NAN_DP_CONFIG_SECURITY) { - nlCfgSecurity = - nanCommand->attr_start(QCA_WLAN_VENDOR_ATTR_NDP_CONFIG_SECURITY); - if (!nlCfgSecurity) - goto cleanup; - - if (nanCommand->put_u32( - QCA_WLAN_VENDOR_ATTR_NDP_SECURITY_TYPE, - 0)) { - goto cleanup; - } - nanCommand->attr_end(nlCfgSecurity); - } if (msg->ndp_cfg.qos_cfg == NAN_DP_CONFIG_QOS) { nlCfgQos = nanCommand->attr_start(QCA_WLAN_VENDOR_ATTR_NDP_CONFIG_QOS); @@ -1034,7 +1021,7 @@ wifi_error nan_data_indication_response(transaction_id id, { ALOGV("NAN_DP_INDICATION_RESPONSE"); wifi_error ret; - struct nlattr *nlData, *nlCfgSecurity, *nlCfgQos; + struct nlattr *nlData, *nlCfgQos; NanCommand *nanCommand = NULL; if (msg == NULL) @@ -1085,19 +1072,6 @@ wifi_error nan_data_indication_response(transaction_id id, goto cleanup; } } - if (msg->ndp_cfg.security_cfg == NAN_DP_CONFIG_SECURITY) { - nlCfgSecurity = - nanCommand->attr_start(QCA_WLAN_VENDOR_ATTR_NDP_CONFIG_SECURITY); - if (!nlCfgSecurity) - goto cleanup; - /* Setting value to 0 for now */ - if (nanCommand->put_u32( - QCA_WLAN_VENDOR_ATTR_NDP_SECURITY_TYPE, - 0)) { - goto cleanup; - } - nanCommand->attr_end(nlCfgSecurity); - } if (msg->ndp_cfg.qos_cfg == NAN_DP_CONFIG_QOS) { nlCfgQos = nanCommand->attr_start(QCA_WLAN_VENDOR_ATTR_NDP_CONFIG_QOS); |