From 58e1cad939b6e17579c33afbd61ea140bb0ce53d Mon Sep 17 00:00:00 2001
From: Yu Wang <yyuwang@codeaurora.org>
Date: Fri, 10 Feb 2017 17:43:15 +0800
Subject: [PATCH] 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
---
 Kbuild                                | 6 +++++-
 core/utils/nlink/src/wlan_nlink_srv.c | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Kbuild b/Kbuild
index dbe43e4beb00..a539f4d64493 100644
--- a/Kbuild
+++ b/Kbuild
@@ -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)
-
diff --git a/core/utils/nlink/src/wlan_nlink_srv.c b/core/utils/nlink/src/wlan_nlink_srv.c
index 312640e08169..99de5c0d51b3 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)
 {
 }