From owner-svn-src-all@FreeBSD.ORG Mon Jul 9 17:25:57 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8C1E7106564A; Mon, 9 Jul 2012 17:25:57 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6CB708FC08; Mon, 9 Jul 2012 17:25:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q69HPvB5030676; Mon, 9 Jul 2012 17:25:57 GMT (envelope-from np@svn.freebsd.org) Received: (from np@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q69HPvO0030671; Mon, 9 Jul 2012 17:25:57 GMT (envelope-from np@svn.freebsd.org) Message-Id: <201207091725.q69HPvO0030671@svn.freebsd.org> From: Navdeep Parhar Date: Mon, 9 Jul 2012 17:25:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238302 - in stable/9/sys/dev: cxgb cxgbe X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 17:25:57 -0000 Author: np Date: Mon Jul 9 17:25:56 2012 New Revision: 238302 URL: http://svn.freebsd.org/changeset/base/238302 Log: 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) Modified: stable/9/sys/dev/cxgb/cxgb_adapter.h stable/9/sys/dev/cxgb/cxgb_main.c stable/9/sys/dev/cxgbe/adapter.h stable/9/sys/dev/cxgbe/t4_main.c Modified: stable/9/sys/dev/cxgb/cxgb_adapter.h ============================================================================== --- stable/9/sys/dev/cxgb/cxgb_adapter.h Mon Jul 9 16:23:59 2012 (r238301) +++ stable/9/sys/dev/cxgb/cxgb_adapter.h Mon Jul 9 17:25:56 2012 (r238302) @@ -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, Modified: stable/9/sys/dev/cxgb/cxgb_main.c ============================================================================== --- stable/9/sys/dev/cxgb/cxgb_main.c Mon Jul 9 16:23:59 2012 (r238301) +++ stable/9/sys/dev/cxgb/cxgb_main.c Mon Jul 9 17:25:56 2012 (r238302) @@ -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) Modified: stable/9/sys/dev/cxgbe/adapter.h ============================================================================== --- stable/9/sys/dev/cxgbe/adapter.h Mon Jul 9 16:23:59 2012 (r238301) +++ stable/9/sys/dev/cxgbe/adapter.h Mon Jul 9 17:25:56 2012 (r238302) @@ -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) Modified: stable/9/sys/dev/cxgbe/t4_main.c ============================================================================== --- stable/9/sys/dev/cxgbe/t4_main.c Mon Jul 9 16:23:59 2012 (r238301) +++ stable/9/sys/dev/cxgbe/t4_main.c Mon Jul 9 17:25:56 2012 (r238302) @@ -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)