summaryrefslogtreecommitdiffstats
path: root/sys/dev/ixgbe/ixgbe.h
diff options
context:
space:
mode:
authorjfv <jfv@FreeBSD.org>2012-11-30 23:13:56 +0000
committerjfv <jfv@FreeBSD.org>2012-11-30 23:13:56 +0000
commit07398249f32ac853914c1fb2f42644d1dadf456f (patch)
tree3f23c1f1c2e84904547fccb5ddaf3bac090c49d8 /sys/dev/ixgbe/ixgbe.h
parent95184bc12a04699b689c1b57c0f7ca5c147162c7 (diff)
downloadFreeBSD-src-07398249f32ac853914c1fb2f42644d1dadf456f.zip
FreeBSD-src-07398249f32ac853914c1fb2f42644d1dadf456f.tar.gz
Patch #6 Whitespace cleanup, and removal of some very old
defines (at Gleb's request). Also, change the defines around the old transmit code to IXGBE_LEGACY_TX, I do this to make it possible to define this regardless of the OS level (it is not defined by default). There are also a couple changed comments for clarity.
Diffstat (limited to 'sys/dev/ixgbe/ixgbe.h')
-rw-r--r--sys/dev/ixgbe/ixgbe.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/sys/dev/ixgbe/ixgbe.h b/sys/dev/ixgbe/ixgbe.h
index 97ddf92..7991b69 100644
--- a/sys/dev/ixgbe/ixgbe.h
+++ b/sys/dev/ixgbe/ixgbe.h
@@ -39,7 +39,7 @@
#include <sys/param.h>
#include <sys/systm.h>
-#if __FreeBSD_version >= 800000
+#ifndef IXGBE_LEGACY_TX
#include <sys/buf_ring.h>
#endif
#include <sys/mbuf.h>
@@ -205,16 +205,6 @@
#define CSUM_OFFLOAD (CSUM_IP|CSUM_TCP|CSUM_UDP)
#endif
-/* For 6.X code compatibility */
-#if !defined(ETHER_BPF_MTAP)
-#define ETHER_BPF_MTAP BPF_MTAP
-#endif
-
-#if __FreeBSD_version < 700000
-#define CSUM_TSO 0
-#define IFCAP_TSO4 0
-#endif
-
/*
* Interrupt Moderation parameters
*/
@@ -316,7 +306,7 @@ struct tx_ring {
u32 txd_cmd;
bus_dma_tag_t txtag;
char mtx_name[16];
-#if __FreeBSD_version >= 800000
+#ifndef IXGBE_LEGACY_TX
struct buf_ring *br;
struct task txq_task;
#endif
OpenPOWER on IntegriCloud