A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 07:03:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Compilation fixes when CONFIG_WLAN_CFR_ENABLE is set

Browse source 
For adrastea targets, enhanced CFR is not supported. When only
CONFIG_WLAN_CFR_ENABLE is set, some compilation errors are
observed as CONFIG_WLAN_ENH_CFR_ENABLE is not set true.

Fix these compilation errors when only CONFIG_WLAN_CFR_ENABLE
is set for targets which do not support enhanced CFR.

Change-Id: Ifafa3880757c5595e1cb2da45aae1c87d50a7aae
CRs-Fixed: 2706901
This commit is contained in:
Surabhi Vishnoi 2020-06-09 20:32:28 +05:30 • committed by nshrivas
commit 040f58df32
1 changed files with 44 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

72
core/hdd/src/wlan_hdd_cfr.c
View file

@ -67,6 +67,7 @@ const struct nla_policy cfr_config_policy[
.type = NLA_U32},
};
#ifdef WLAN_ENH_CFR_ENABLE
static QDF_STATUS
wlan_cfg80211_cfr_set_group_config(struct wlan_objmgr_vdev *vdev,
struct nlattr *tb[])
@ -281,38 +282,14 @@ wlan_cfg80211_cfr_set_config(struct wlan_objmgr_vdev *vdev,
}
static int
wlan_cfg80211_peer_cfr_capture_cfg(struct wiphy *wiphy,
struct hdd_adapter *adapter,
const void *data,
int data_len)
wlan_cfg80211_peer_enh_cfr_capture(struct hdd_adapter *adapter,
struct nlattr **tb)
{
struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_PEER_CFR_MAX + 1];
struct cfr_wlanconfig_param params = { 0 };
struct wlan_objmgr_vdev *vdev;
uint8_t version = 0;
bool is_start_capture = false;
QDF_STATUS status;
int ret;
if (wlan_cfg80211_nla_parse(
tb,
QCA_WLAN_VENDOR_ATTR_PEER_CFR_MAX,
data,
data_len,
cfr_config_policy)) {
hdd_err("Invalid ATTR");
return -EINVAL;
}
if (tb[QCA_WLAN_VENDOR_ATTR_PEER_CFR_VERSION]) {
version = nla_get_u8(tb[
QCA_WLAN_VENDOR_ATTR_PEER_CFR_VERSION]);
hdd_debug("version %d", version);
if (version != ENHANCED_CFR_VERSION) {
hdd_err("unsupported version");
return -EFAULT;
}
}
int ret = 0;
if (tb[QCA_WLAN_VENDOR_ATTR_PEER_CFR_ENABLE]) {
is_start_capture = nla_get_flag(tb[
@ -356,9 +333,48 @@ wlan_cfg80211_peer_cfr_capture_cfg(struct wiphy *wiphy,
}
wlan_objmgr_vdev_release_ref(vdev, WLAN_CFR_ID);
return ret;
}
#else
static int
wlan_cfg80211_peer_enh_cfr_capture(struct hdd_adapter *adapter,
struct nlattr **tb)
{
return 0;
}
#endif
static int
wlan_cfg80211_peer_cfr_capture_cfg(struct wiphy *wiphy,
struct hdd_adapter *adapter,
const void *data,
int data_len)
{
struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_PEER_CFR_MAX + 1];
uint8_t version = 0;
if (wlan_cfg80211_nla_parse(
tb,
QCA_WLAN_VENDOR_ATTR_PEER_CFR_MAX,
data,
data_len,
cfr_config_policy)) {
hdd_err("Invalid ATTR");
return -EINVAL;
}
if (tb[QCA_WLAN_VENDOR_ATTR_PEER_CFR_VERSION]) {
version = nla_get_u8(tb[
QCA_WLAN_VENDOR_ATTR_PEER_CFR_VERSION]);
hdd_debug("version %d", version);
if (version != ENHANCED_CFR_VERSION) {
hdd_err("unsupported version");
return -EFAULT;
}
}
return wlan_cfg80211_peer_enh_cfr_capture(adapter, tb);
}
static int __wlan_hdd_cfg80211_peer_cfr_capture_cfg(struct wiphy *wiphy,
struct wireless_dev *wdev,