From owner-svn-src-all@FreeBSD.ORG  Tue Jul  3 22:17:36 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 D388A1065672;
	Tue,  3 Jul 2012 22:17:36 +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 B93158FC15;
	Tue,  3 Jul 2012 22:17:36 +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 q63MHa28073131;
	Tue, 3 Jul 2012 22:17:36 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q63MHaYP073128;
	Tue, 3 Jul 2012 22:17:36 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201207032217.q63MHaYP073128@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Tue, 3 Jul 2012 22:17:36 +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: r238088 - 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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jul 2012 22:17:36 -0000

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)