diff options
| author | andrew <andrew@FreeBSD.org> | 2015-03-19 13:00:02 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2015-03-19 13:00:02 +0000 |
| commit | ff2023509145c30dc814825a56e19334aa058c1f (patch) | |
| tree | 1e31104001c23fd75474ebac745b07fc44c5e92d /sys/dev/ixgbe | |
| parent | 9777f9409e5a811cf24fe95bcff1e385588f1974 (diff) | |
| download | FreeBSD-src-ff2023509145c30dc814825a56e19334aa058c1f.zip FreeBSD-src-ff2023509145c30dc814825a56e19334aa058c1f.tar.gz | |
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.
Diffstat (limited to 'sys/dev/ixgbe')
| -rw-r--r-- | sys/dev/ixgbe/ix_txrx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/ixgbe/ix_txrx.c b/sys/dev/ixgbe/ix_txrx.c index 88cd5b4..536bf9f 100644 --- a/sys/dev/ixgbe/ix_txrx.c +++ b/sys/dev/ixgbe/ix_txrx.c @@ -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; |
