Date: Thu, 19 Mar 2015 13:00:03 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280252 - head/sys/dev/ixgbe Message-ID: <201503191300.t2JD03BW034912@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Thu Mar 19 13:00:02 2015 New Revision: 280252 URL: https://svnweb.freebsd.org/changeset/base/280252 Log: Fix building ixgbe with gcc, it doesn't like nested extern declarations. The fix is to move the extern declaration ix_crcstrip out of ixgbe_setup_hw_rsc. Modified: head/sys/dev/ixgbe/ix_txrx.c Modified: head/sys/dev/ixgbe/ix_txrx.c ============================================================================== --- head/sys/dev/ixgbe/ix_txrx.c Thu Mar 19 12:49:55 2015 (r280251) +++ head/sys/dev/ixgbe/ix_txrx.c Thu Mar 19 13:00:02 2015 (r280252) @@ -50,6 +50,8 @@ #include <net/netmap.h> #include <sys/selinfo.h> #include <dev/netmap/netmap_kern.h> + +extern int ix_crcstrip; #endif /* @@ -1240,7 +1242,6 @@ ixgbe_setup_hw_rsc(struct rx_ring *rxr) rdrxctl = IXGBE_READ_REG(hw, IXGBE_RDRXCTL); rdrxctl &= ~IXGBE_RDRXCTL_RSCFRSTSIZE; #ifdef DEV_NETMAP /* crcstrip is optional in netmap */ - extern int ix_crcstrip; if (adapter->ifp->if_capenable & IFCAP_NETMAP && !ix_crcstrip) #endif /* DEV_NETMAP */ rdrxctl |= IXGBE_RDRXCTL_CRCSTRIP;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503191300.t2JD03BW034912>