Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 3 Jul 2012 22:17:36 +0000 (UTC)
From:      Navdeep Parhar <np@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r238088 - in stable/9/sys/dev: cxgb cxgbe
Message-ID:  <201207032217.q63MHaYP073128@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: np
Date: Tue Jul  3 22:17:36 2012
New Revision: 238088
URL: http://svn.freebsd.org/changeset/base/238088

Log:
  Do not enable IFCAP_TSO6 in cxgb(4) and cxgbe(4) in stable/9.  The
  kernel code in 9 isn't quite ready for TSO6 yet.
  
  This is a direct commit to stable/9.  IFCAP_TSO6 works properly in head
  and there is no need to disable it over there.
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/dev/cxgb/cxgb_main.c
  stable/9/sys/dev/cxgbe/t4_main.c

Modified: stable/9/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- stable/9/sys/dev/cxgb/cxgb_main.c	Tue Jul  3 21:41:19 2012	(r238087)
+++ stable/9/sys/dev/cxgb/cxgb_main.c	Tue Jul  3 22:17:36 2012	(r238088)
@@ -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
+#define CXGB_CAP_ENABLE (CXGB_CAP & ~IFCAP_TSO6)
 
 static int
 cxgb_port_attach(device_t dev)

Modified: stable/9/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/9/sys/dev/cxgbe/t4_main.c	Tue Jul  3 21:41:19 2012	(r238087)
+++ stable/9/sys/dev/cxgbe/t4_main.c	Tue Jul  3 22:17:36 2012	(r238088)
@@ -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)
+#define T4_CAP_ENABLE (T4_CAP & ~IFCAP_TSO6)
 
 static int
 cxgbe_attach(device_t dev)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207032217.q63MHaYP073128>