Author: erj
Date: Thu Sep 1 01:08:18 2016
New Revision: 305168
URL: https://svnweb.freebsd.org/changeset/base/305168
Log:
Fix linker warnings (errors on gcc) that resulted from r304510.
The variables that are extern in the netmap header file should be
defined in ixl_txrx.c (the file that is included in both ixl(4)/ixlv(4),
not in the main driver source files.
Reported by: ed@, dim@, ngie@
Modified:
head/sys/dev/ixl/if_ixlv.c
head/sys/dev/ixl/ixl_txrx.c
head/sys/dev/netmap/if_ixl_netmap.h
Modified: head/sys/dev/ixl/if_ixlv.c
==============================================================================
--- head/sys/dev/ixl/if_ixlv.c Thu Sep 1 00:51:59 2016 (r305167)
+++ head/sys/dev/ixl/if_ixlv.c Thu Sep 1 01:08:18 2016 (r305168)
@@ -217,11 +217,6 @@ TUNABLE_INT("hw.ixlv.tx_itr", &ixlv_tx_i
SYSCTL_INT(_hw_ixlv, OID_AUTO, tx_itr, CTLFLAG_RDTUN,
&ixlv_tx_itr, 0, "TX Interrupt Rate");
-/* Fix when building as a standalone module when netmap is enabled */
-#if defined(DEV_NETMAP) && !defined(NETMAP_IXL_MAIN)
-int ixl_rx_miss, ixl_rx_miss_bufs, ixl_crcstrip;
-#endif
-
/*********************************************************************
* Device identification routine
*
Modified: head/sys/dev/ixl/ixl_txrx.c
==============================================================================
--- head/sys/dev/ixl/ixl_txrx.c Thu Sep 1 00:51:59 2016 (r305167)
+++ head/sys/dev/ixl/ixl_txrx.c Thu Sep 1 01:08:18 2016 (r305168)
@@ -69,6 +69,7 @@ static inline u32 ixl_get_tx_head(struct
#ifdef DEV_NETMAP
#include <dev/netmap/if_ixl_netmap.h>
+int ixl_rx_miss, ixl_rx_miss_bufs, ixl_crcstrip = 1;
#endif /* DEV_NETMAP */
/*
Modified: head/sys/dev/netmap/if_ixl_netmap.h
==============================================================================
--- head/sys/dev/netmap/if_ixl_netmap.h Thu Sep 1 00:51:59 2016
(r305167)
+++ head/sys/dev/netmap/if_ixl_netmap.h Thu Sep 1 01:08:18 2016
(r305168)
@@ -71,7 +71,6 @@ SYSCTL_DECL(_dev_netmap);
/*
* The xl driver by default strips CRCs and we do not override it.
*/
-int ixl_rx_miss, ixl_rx_miss_bufs, ixl_crcstrip = 1;
#if 0
SYSCTL_INT(_dev_netmap, OID_AUTO, ixl_crcstrip,
CTLFLAG_RW, &ixl_crcstrip, 1, "strip CRC on rx frames");
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
