Date: Wed, 6 Sep 2017 07:15:22 +0000 (UTC) From: Ryan Libby <rlibby@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r323213 - in stable/11/sys: dev/qlnx/qlnxe modules/qlnx modules/qlnx/qlnxe Message-ID: <201709060715.v867FMWc011236@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rlibby Date: Wed Sep 6 07:15:21 2017 New Revision: 323213 URL: https://svnweb.freebsd.org/changeset/base/323213 Log: MFC r321106: qlnx: gcc build errors Modified: stable/11/sys/dev/qlnx/qlnxe/ecore_hw.h stable/11/sys/dev/qlnx/qlnxe/qlnx_ioctl.c stable/11/sys/modules/qlnx/Makefile stable/11/sys/modules/qlnx/qlnxe/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/qlnx/qlnxe/ecore_hw.h ============================================================================== --- stable/11/sys/dev/qlnx/qlnxe/ecore_hw.h Wed Sep 6 07:09:59 2017 (r323212) +++ stable/11/sys/dev/qlnx/qlnxe/ecore_hw.h Wed Sep 6 07:15:21 2017 (r323213) @@ -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: stable/11/sys/dev/qlnx/qlnxe/qlnx_ioctl.c ============================================================================== --- stable/11/sys/dev/qlnx/qlnxe/qlnx_ioctl.c Wed Sep 6 07:09:59 2017 (r323212) +++ stable/11/sys/dev/qlnx/qlnxe/qlnx_ioctl.c Wed Sep 6 07:15:21 2017 (r323213) @@ -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: stable/11/sys/modules/qlnx/Makefile ============================================================================== --- stable/11/sys/modules/qlnx/Makefile Wed Sep 6 07:09:59 2017 (r323212) +++ stable/11/sys/modules/qlnx/Makefile Wed Sep 6 07:15:21 2017 (r323213) @@ -32,6 +32,8 @@ # $FreeBSD$ # +SYSDIR?=${SRCTOP}/sys +.include "${SYSDIR}/conf/kern.opts.mk" SUBDIR=qlnxe Modified: stable/11/sys/modules/qlnx/qlnxe/Makefile ============================================================================== --- stable/11/sys/modules/qlnx/qlnxe/Makefile Wed Sep 6 07:09:59 2017 (r323212) +++ stable/11/sys/modules/qlnx/qlnxe/Makefile Wed Sep 6 07:15:21 2017 (r323213) @@ -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 @@ -65,6 +65,4 @@ CFLAGS += -DECORE_CONFIG_DIRECT_HWFN #CFLAGS += -DQLNX_MAX_COALESCE #CFLAGS += -DQLNX_RCV_IN_TASKQ - -.include <bsd.kmod.mk> - +CWARNFLAGS+= -Wno-cast-qual
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709060715.v867FMWc011236>