svn commit: r321106 - in head/sys: dev/qlnx/qlnxe modules/qlnx modules/qlnx/qlnxe

[Ryan Libby]

Author: rlibby
Date: Tue Jul 18 06:15:05 2017
New Revision: 321106
URL: https://svnweb.freebsd.org/changeset/base/321106

Log:
  qlnx: gcc build errors
  
  Propagate warning flags from kern.opts.mk and then fix minor -Werror
  issues when building with gcc from -Wredundant-decls, -Wnested-externs,
  -Wuninitialized.
  
  Reviewed by:	davidcs
  Approved by:	markj (mentor)
  Sponsored by:	Dell EMC Isilon
  Differential Revision:	https://reviews.freebsd.org/D11413

Modified:
  head/sys/dev/qlnx/qlnxe/ecore_hw.h
  head/sys/dev/qlnx/qlnxe/qlnx_ioctl.c
  head/sys/dev/qlnx/qlnxe/qlnx_os.c
  head/sys/modules/qlnx/Makefile
  head/sys/modules/qlnx/qlnxe/Makefile

Modified: head/sys/dev/qlnx/qlnxe/ecore_hw.h
==============================================================================
--- head/sys/dev/qlnx/qlnxe/ecore_hw.h	Tue Jul 18 03:58:59 2017	(r321105)
+++ head/sys/dev/qlnx/qlnxe/ecore_hw.h	Tue Jul 18 06:15:05 2017	(r321106)
@@ -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

Modified: head/sys/dev/qlnx/qlnxe/qlnx_ioctl.c
==============================================================================
--- head/sys/dev/qlnx/qlnxe/qlnx_ioctl.c	Tue Jul 18 03:58:59 2017	(r321105)
+++ head/sys/dev/qlnx/qlnxe/qlnx_ioctl.c	Tue Jul 18 06:15:05 2017	(r321106)
@@ -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));
 

Modified: head/sys/dev/qlnx/qlnxe/qlnx_os.c
==============================================================================
--- head/sys/dev/qlnx/qlnxe/qlnx_os.c	Tue Jul 18 03:58:59 2017	(r321105)
+++ head/sys/dev/qlnx/qlnxe/qlnx_os.c	Tue Jul 18 06:15:05 2017	(r321106)
@@ -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;

Modified: head/sys/modules/qlnx/Makefile
==============================================================================
--- head/sys/modules/qlnx/Makefile	Tue Jul 18 03:58:59 2017	(r321105)
+++ head/sys/modules/qlnx/Makefile	Tue Jul 18 06:15:05 2017	(r321106)
@@ -32,6 +32,8 @@
 # $FreeBSD$
 #
 
+SYSDIR?=${SRCTOP}/sys
+.include "${SYSDIR}/conf/kern.opts.mk"
 
 SUBDIR=qlnxe
 

Modified: head/sys/modules/qlnx/qlnxe/Makefile
==============================================================================
--- head/sys/modules/qlnx/qlnxe/Makefile	Tue Jul 18 03:58:59 2017	(r321105)
+++ head/sys/modules/qlnx/qlnxe/Makefile	Tue Jul 18 06:15:05 2017	(r321106)
@@ -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/includ
 #CFLAGS += -DQLNX_QSORT_LRO
 #CFLAGS += -DQLNX_MAX_COALESCE
 
-
-.include <bsd.kmod.mk>
-
+CWARNFLAGS+= -Wno-cast-qual