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
This commit is contained in:
Yu Wang 2017-02-10 17:43:15 +08:00 • committed by qcabuildsw
commit 58e1cad939
2 changed files with 8 additions and 4 deletions

6
Kbuild
View file

@ -286,6 +286,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
@ -1817,4 +1822,3 @@ endif
# Module information used by KBuild framework
obj-$(CONFIG_QCA_CLD_WLAN) += $(MODNAME).o
$(MODNAME)-y := $(OBJS)

View file

@ -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)
{
}