From 4849fcc9cd9c988185c28316181c477ce5d8064e Mon Sep 17 00:00:00 2001
From: Houston Hoffman <hhoffman@codeaurora.org>
Date: Thu, 5 May 2016 15:42:35 -0700
Subject: [PATCH] qcacmn: Fix CONFIG_CNSS ifdefery

Driver needs to support CONFIG_CNSS not defined.

Change-Id: I6c0112274fe5aa1ab3803a19efccee0381bc1964
CRs-Fixed: 1012824
---
 hif/src/ce/ce_tasklet.c         | 2 +-
 hif/src/icnss_stub/icnss_stub.c | 2 ++
 hif/src/pcie/if_pci.c           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hif/src/ce/ce_tasklet.c b/hif/src/ce/ce_tasklet.c
index f64aff2ff12d..5c692cc6a03d 100644
--- a/hif/src/ce/ce_tasklet.c
+++ b/hif/src/ce/ce_tasklet.c
@@ -42,8 +42,8 @@
 #include "ce_tasklet.h"
 #ifdef CONFIG_CNSS
 #include <net/cnss.h>
-#include "platform_icnss.h"
 #endif
+#include "platform_icnss.h"
 #include "hif_debug.h"
 #include "hif_napi.h"
 
diff --git a/hif/src/icnss_stub/icnss_stub.c b/hif/src/icnss_stub/icnss_stub.c
index 20ed4ce61131..1fdc859287e8 100644
--- a/hif/src/icnss_stub/icnss_stub.c
+++ b/hif/src/icnss_stub/icnss_stub.c
@@ -34,7 +34,9 @@
 #include "hif_debug.h"
 #include "qdf_status.h"
 #include "qwlan_version.h"
+#ifdef CONFIG_CNSS
 #include <net/cnss.h>
+#endif
 
 /**
  * struct icnss_stub_entry
diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c
index 5cf44983a8ca..fc57fae076f8 100644
--- a/hif/src/pcie/if_pci.c
+++ b/hif/src/pcie/if_pci.c
@@ -2315,7 +2315,7 @@ void hif_pci_prevent_linkdown(struct hif_softc *scn, bool flag)
 	cnss_wlan_pm_control(flag);
 }
 #else
-void hif_pci_prevent_linkdown(struct hif_opaque_softc *scn, bool flag)
+void hif_pci_prevent_linkdown(struct hif_softc *scn, bool flag)
 {
 	HIF_ERROR("wlan: %s pcie power collapse",
 			(flag ? "disable" : "enable"));