From 647e27fd2741181bd59fb4a20fc527292d29ca8a Mon Sep 17 00:00:00 2001
From: np <np@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 9 Jul 2012 17:25:56 +0000
Subject: [PATCH] Re-enable IFCAP_TSO6 in cxgb(4) and cxgbe(4) in stable/9. 
 The kernel changes needed for all this to work have now been MFC'd to 9 by
 bz@.

This is a direct commit to stable/9 that removes earlier changes made to
drivers in this branch only.

Approved by:	re (kib)


git-svn-id: svn://svn.freebsd.org/base/stable/9@238302 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/dev/cxgb/cxgb_adapter.h | 9 ---------
 sys/dev/cxgb/cxgb_main.c    | 2 +-
 sys/dev/cxgbe/adapter.h     | 9 ---------
 sys/dev/cxgbe/t4_main.c     | 2 +-
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/sys/dev/cxgb/cxgb_adapter.h b/sys/dev/cxgb/cxgb_adapter.h
index 983d160f4..8b368065a 100644
--- a/sys/dev/cxgb/cxgb_adapter.h
+++ b/sys/dev/cxgb/cxgb_adapter.h
@@ -81,15 +81,6 @@ extern int cxgb_debug;
 #define MTX_DESTROY mtx_destroy
 #endif
 
-#ifndef IFCAP_HWCSUM_IPV6
-#define IFCAP_HWCSUM_IPV6 0
-#define CSUM_TCP_IPV6 0
-#define CSUM_UDP_IPV6 0
-#define IFCAP_TXCSUM_IPV6 0
-#define IFCAP_RXCSUM_IPV6 0
-#define CSUM_DATA_VALID_IPV6 0
-#endif
-
 enum {
 	LF_NO = 0,
 	LF_MAYBE,
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index 9294c18b9..9ce0d4aef 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -987,7 +987,7 @@ cxgb_makedev(struct port_info *pi)
 #define CXGB_CAP (IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU | IFCAP_HWCSUM | \
     IFCAP_VLAN_HWCSUM | IFCAP_TSO | IFCAP_JUMBO_MTU | IFCAP_LRO | \
     IFCAP_VLAN_HWTSO | IFCAP_LINKSTATE | IFCAP_HWCSUM_IPV6)
-#define CXGB_CAP_ENABLE (CXGB_CAP & ~IFCAP_TSO6)
+#define CXGB_CAP_ENABLE (CXGB_CAP)
 
 static int
 cxgb_port_attach(device_t dev)
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
index 91619ad11..5b0efa1ff 100644
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -57,15 +57,6 @@ MALLOC_DECLARE(M_CXGBE);
 #define CXGBE_UNIMPLEMENTED(s) \
     panic("%s (%s, line %d) not implemented yet.", s, __FILE__, __LINE__)
 
-#ifndef IFCAP_HWCSUM_IPV6
-#define IFCAP_HWCSUM_IPV6 0
-#define CSUM_TCP_IPV6 0
-#define CSUM_UDP_IPV6 0
-#define IFCAP_TXCSUM_IPV6 0
-#define IFCAP_RXCSUM_IPV6 0
-#define CSUM_DATA_VALID_IPV6 0
-#endif
-
 #if defined(__i386__) || defined(__amd64__)
 static __inline void
 prefetch(void *x)
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index 447e4260f..02d25da97 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -824,7 +824,7 @@ cxgbe_probe(device_t dev)
 #define T4_CAP (IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU | IFCAP_HWCSUM | \
     IFCAP_VLAN_HWCSUM | IFCAP_TSO | IFCAP_JUMBO_MTU | IFCAP_LRO | \
     IFCAP_VLAN_HWTSO | IFCAP_LINKSTATE | IFCAP_HWCSUM_IPV6)
-#define T4_CAP_ENABLE (T4_CAP & ~IFCAP_TSO6)
+#define T4_CAP_ENABLE (T4_CAP)
 
 static int
 cxgbe_attach(device_t dev)
-- 
2.45.0