diff options
| author | Yu Wang <yyuwang@codeaurora.org> | 2017-02-10 17:43:15 +0800 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2017-02-14 16:27:51 -0800 |
| commit | e47974200d5b252bd6c005e6e64aecdfc47b7405 (patch) | |
| tree | c8f258c39cb862f5d3381e014f8e464e18d0e81f | |
| parent | 3a2d442a61a5e836becf3e961fbb8e11fe20ffba (diff) | |
qcacld-3.0: fix compilation errors for HL target on MDM
1. sdio related source files are not included due to
CONFIG_HIF_SDIO is not enabled.
Enabled CONFIG_HIF_SDIO if CONFIG_ROME_IF is sdio.
2. Paramters for nl_srv_init/nl_srv_exit are incorrect
if MULTI_IF_NAME is defined.
Correct the parameters, to align with the prototype.
Change-Id: I4e395e07b12e3b1904cabfa4a40fa10845d8e735
CRs-Fixed: 2004368
| -rw-r--r-- | Kbuild | 6 | ||||
| -rw-r--r-- | core/utils/nlink/src/wlan_nlink_srv.c | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -277,6 +277,11 @@ ifeq ($(CONFIG_ROME_IF),usb) CONFIG_PLD_USB_CNSS := y endif +#Enable SDIO specific APIS +ifeq ($(CONFIG_ROME_IF),sdio) + CONFIG_HIF_SDIO := 1 +endif + #Enable pci read/write config functions ifeq ($(CONFIG_ROME_IF),pci) CONFIG_ATH_PCI := 1 @@ -1647,4 +1652,3 @@ endif # Module information used by KBuild framework obj-$(CONFIG_QCA_CLD_WLAN) += $(MODNAME).o $(MODNAME)-y := $(OBJS) - diff --git a/core/utils/nlink/src/wlan_nlink_srv.c b/core/utils/nlink/src/wlan_nlink_srv.c index 349207f7602e..cef164515339 100644 --- a/core/utils/nlink/src/wlan_nlink_srv.c +++ b/core/utils/nlink/src/wlan_nlink_srv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -503,12 +503,12 @@ int nl_srv_is_initialized(void) #include <wlan_nlink_srv.h> -int nl_srv_init(void) +int nl_srv_init(void *wiphy) { return 0; } -void nl_srv_exit(int dst_pid) +void nl_srv_exit(void) { } |