diff options
| author | Eric Joyner <erj@FreeBSD.org> | 2016-09-01 01:08:18 +0000 |
|---|---|---|
| committer | Eric Joyner <erj@FreeBSD.org> | 2016-09-01 01:08:18 +0000 |
| commit | ff9b61ca075659efd790dd8109b4680f2ac8ea61 (patch) | |
| tree | d0e7ca828fa795721caef3bfa0cf92c158895eb8 /sys/dev | |
| parent | a9feb2cdbb612b58e2d5b31c2732d484e3481228 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ixl/if_ixlv.c | 5 | ||||
| -rw-r--r-- | sys/dev/ixl/ixl_txrx.c | 1 | ||||
| -rw-r--r-- | sys/dev/netmap/if_ixl_netmap.h | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/ixl/if_ixlv.c b/sys/dev/ixl/if_ixlv.c index c230338bbbec9..c447c34689ee0 100644 --- a/sys/dev/ixl/if_ixlv.c +++ b/sys/dev/ixl/if_ixlv.c @@ -217,11 +217,6 @@ TUNABLE_INT("hw.ixlv.tx_itr", &ixlv_tx_itr); 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 * diff --git a/sys/dev/ixl/ixl_txrx.c b/sys/dev/ixl/ixl_txrx.c index 5cf54fa9410a5..9a7fae3b055f4 100644 --- a/sys/dev/ixl/ixl_txrx.c +++ b/sys/dev/ixl/ixl_txrx.c @@ -69,6 +69,7 @@ static inline u32 ixl_get_tx_head(struct ixl_queue *que); #ifdef DEV_NETMAP #include <dev/netmap/if_ixl_netmap.h> +int ixl_rx_miss, ixl_rx_miss_bufs, ixl_crcstrip = 1; #endif /* DEV_NETMAP */ /* diff --git a/sys/dev/netmap/if_ixl_netmap.h b/sys/dev/netmap/if_ixl_netmap.h index f7e7baaf6bc2c..2c7f9be541b3a 100644 --- a/sys/dev/netmap/if_ixl_netmap.h +++ b/sys/dev/netmap/if_ixl_netmap.h @@ -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"); |