diff options
| author | Ke Huang <keh@codeaurora.org> | 2018-07-10 20:10:32 +0800 |
|---|---|---|
| committer | Shirle Yuen <shirleyshukyee@google.com> | 2018-07-30 10:34:58 -0700 |
| commit | fc8576cd6655905b26117e65e2163f8ba2bf5d98 (patch) | |
| tree | 910849e5e5b457a5e8ce69cb7399cf995b831a2e | |
| parent | 63f022b9442e6398bc41d16366ae33de5257be22 (diff) | |
| download | qcom-msm8x09-v3.10-fc8576cd6655905b26117e65e2163f8ba2bf5d98.tar.gz | |
qcacld-2.0: Fix the dsrc_config fail issue
Revert the changes of Validating NLA attr in
wlan_hdd_cfg80211_ocb_set_config API to fix the
dsrc_config fail issue.
Change-Id: I5037498a510820a86cba9e61149640a957b46086
CRs-Fixed: 2109727
Bug: 111289931
(cherry picked from commit 9e5f7b06795881af5155a0a0d1d008228731f98c)
| -rw-r--r-- | drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_ocb.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_ocb.c b/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_ocb.c index d511f9b097b..8de1fd9cf7b 100644 --- a/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_ocb.c +++ b/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_ocb.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -1013,18 +1013,10 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy, tb[QCA_WLAN_VENDOR_ATTR_OCB_SET_CONFIG_SCHEDULE_SIZE]); /* Get the ndl chan array and the ndl active state array. */ - if (!tb[QCA_WLAN_VENDOR_ATTR_OCB_SET_CONFIG_NDL_CHANNEL_ARRAY]) { - hddLog(LOGE, FL("NDL_CHANNEL_ARRAY is not present")); - return -EINVAL; - } ndl_chan_list = tb[QCA_WLAN_VENDOR_ATTR_OCB_SET_CONFIG_NDL_CHANNEL_ARRAY]; ndl_chan_list_len = (ndl_chan_list ? nla_len(ndl_chan_list) : 0); - if (!tb[QCA_WLAN_VENDOR_ATTR_OCB_SET_CONFIG_NDL_ACTIVE_STATE_ARRAY]) { - hddLog(LOGE, FL("NDL_ACTIVE_STATE_ARRAY is not present")); - return -EINVAL; - } ndl_active_state_list = tb[QCA_WLAN_VENDOR_ATTR_OCB_SET_CONFIG_NDL_ACTIVE_STATE_ARRAY]; ndl_active_state_list_len = (ndl_active_state_list ? |