diff options
| author | ngie <ngie@FreeBSD.org> | 2015-12-14 14:44:23 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-12-14 14:44:23 +0000 |
| commit | f20c3249492e4cc8f2f92d29ffeb00a804cd45f0 (patch) | |
| tree | fa64a773f5805623716fbc2a0de87b65a29b9274 | |
| parent | 98e6718d915fa5a645555a7bf1f41f75c5b53107 (diff) | |
| download | FreeBSD-src-f20c3249492e4cc8f2f92d29ffeb00a804cd45f0.zip FreeBSD-src-f20c3249492e4cc8f2f92d29ffeb00a804cd45f0.tar.gz | |
Unbreak the powerpc/powerpc64 tinderbox
PR: 198805
Submitted by: sbruno
MFC r280430:
r280430 (by bz):
Make ix_crcstrip a public symbol for the moment; it probably is not
the right solution but I will leave it to experts to untangle this
problem to properly stop the build failures.
At the moment only if_ix.c includes dev/netmap/ixgbe_netmap.h which is
good as ixgbe_netmap.h defines a couple of (file) static variables--thus
local to if_ix.c.
static int ix_crcstrip however now also got checked from ix_txrx.c
(as an extern) and should not be visible there. In fact we do see
powerpc and powerpc64 build failures because of this. It is unclear
to me why on other (clang built?) architectures this does not lead
to a reference of an undefined symbol and similar build breakage.
| -rw-r--r-- | sys/dev/netmap/ixgbe_netmap.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/netmap/ixgbe_netmap.h b/sys/dev/netmap/ixgbe_netmap.h index 3dc628a..f1f03cb 100644 --- a/sys/dev/netmap/ixgbe_netmap.h +++ b/sys/dev/netmap/ixgbe_netmap.h @@ -61,7 +61,8 @@ * count packets that might be missed due to lost interrupts. */ SYSCTL_DECL(_dev_netmap); -static int ix_rx_miss, ix_rx_miss_bufs, ix_crcstrip; +static int ix_rx_miss, ix_rx_miss_bufs; +int ix_crcstrip; SYSCTL_INT(_dev_netmap, OID_AUTO, ix_crcstrip, CTLFLAG_RW, &ix_crcstrip, 0, "strip CRC on rx frames"); SYSCTL_INT(_dev_netmap, OID_AUTO, ix_rx_miss, |
