5 files changed, 8 insertions, 16 deletions

diff --git a/sys/dev/qlnx/qlnxe/ecore_hw.h b/sys/dev/qlnx/qlnxe/ecore_hw.h
index f2d4452daef85..b07239c896468 100644
--- a/sys/dev/qlnx/qlnxe/ecore_hw.h
+++ b/sys/dev/qlnx/qlnxe/ecore_hw.h
@@ -90,15 +90,6 @@ enum _dmae_cmd_crc_mask {
 #define DMAE_MAX_CLIENTS	32
 
 /**
-* @brief ecore_gtt_init - Initialize GTT windows
-*
-* @param p_hwfn
-* @param p_ptt
-*/
-void ecore_gtt_init(struct ecore_hwfn *p_hwfn,
-		    struct ecore_ptt *p_ptt);
-
-/**
  * @brief ecore_ptt_invalidate - Forces all ptt entries to be re-configured
  *
  * @param p_hwfn
diff --git a/sys/dev/qlnx/qlnxe/qlnx_ioctl.c b/sys/dev/qlnx/qlnxe/qlnx_ioctl.c
index 41a8f8d985923..c5572c78a8cbb 100644
--- a/sys/dev/qlnx/qlnxe/qlnx_ioctl.c
+++ b/sys/dev/qlnx/qlnxe/qlnx_ioctl.c
@@ -534,12 +534,13 @@ qlnx_get_regs(qlnx_host_t *ha, qlnx_get_regs_t *regs)
 	return (rval);
 }
 
+extern char qlnx_name_str[];
+extern char qlnx_ver_str[];
+
 static int
 qlnx_drv_info(qlnx_host_t *ha, qlnx_drvinfo_t *drv_info)
 {
 	int i;
-	extern char qlnx_name_str[];
-	extern char qlnx_ver_str[];
 
 	bzero(drv_info, sizeof(qlnx_drvinfo_t));
 
diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c
index 2e9ecf2a62969..ff106d6486845 100644
--- a/sys/dev/qlnx/qlnxe/qlnx_os.c
+++ b/sys/dev/qlnx/qlnxe/qlnx_os.c
@@ -396,7 +396,7 @@ qlnx_fp_taskqueue(void *context, int pending)
         qlnx_host_t		*ha;
         struct ifnet		*ifp;
         struct mbuf		*mp;
-        int			ret;
+        int			ret = -1;
 	int			lro_enable;
 	int			rx_int = 0, total_rx_count = 0;
 	struct thread		*cthread;
diff --git a/sys/modules/qlnx/Makefile b/sys/modules/qlnx/Makefile
index f4515e9add459..f9e4ee442bea4 100644
--- a/sys/modules/qlnx/Makefile
+++ b/sys/modules/qlnx/Makefile
@@ -32,6 +32,8 @@
 # $FreeBSD$
 #
 
+SYSDIR?=${SRCTOP}/sys
+.include "${SYSDIR}/conf/kern.opts.mk"
 
 SUBDIR=qlnxe
 
diff --git a/sys/modules/qlnx/qlnxe/Makefile b/sys/modules/qlnx/qlnxe/Makefile
index 2b91540daa9a6..f626102098a90 100644
--- a/sys/modules/qlnx/qlnxe/Makefile
+++ b/sys/modules/qlnx/qlnxe/Makefile
@@ -50,7 +50,7 @@ SRCS+= device_if.h
 SRCS+= bus_if.h
 SRCS+= pci_if.h
 
-CWARNEXTRA += -Wno-cast-qual
+.include <bsd.kmod.mk>
 
 CFLAGS += -DQLNX_DEBUG
 CFLAGS += -DECORE_PACKAGE
@@ -66,6 +66,4 @@ CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
 #CFLAGS += -DQLNX_QSORT_LRO
 #CFLAGS += -DQLNX_MAX_COALESCE
 
-
-.include <bsd.kmod.mk>
-
+CWARNFLAGS+= -Wno-cast-qual