From owner-svn-src-all@FreeBSD.ORG  Tue Apr 12 01:19:24 2011
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 4B44E106564A;
	Tue, 12 Apr 2011 01:19:24 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3779B8FC08;
	Tue, 12 Apr 2011 01:19:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3C1JORI005236;
	Tue, 12 Apr 2011 01:19:24 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3C1JOFq005234;
	Tue, 12 Apr 2011 01:19:24 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201104120119.p3C1JOFq005234@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Tue, 12 Apr 2011 01:19:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220555 - head/sys/ofed/drivers/infiniband/ulp/ipoib
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, 12 Apr 2011 01:19:24 -0000

Author: bz
Date: Tue Apr 12 01:19:23 2011
New Revision: 220555
URL: http://svn.freebsd.org/changeset/base/220555

Log:
  Even though this block is not compiled currently, properly assign
  CSUM_TSO to if_hwassist rather than if_capabilities to avoid future
  errors.
  
  Reviewed by:	jeff

Modified:
  head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c

Modified: head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c	Tue Apr 12 00:38:22 2011	(r220554)
+++ head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c	Tue Apr 12 01:19:23 2011	(r220555)
@@ -924,8 +924,10 @@ ipoib_set_dev_features(struct ipoib_dev_
 	}
 
 #if 0
-	if (priv->dev->features & NETIF_F_SG && priv->hca_caps & IB_DEVICE_UD_TSO)
-		priv->dev->if_capabilities |= IFCAP_TSO4 | CSUM_TSO;
+	if (priv->dev->features & NETIF_F_SG && priv->hca_caps & IB_DEVICE_UD_TSO) {
+		priv->dev->if_capabilities |= IFCAP_TSO4;
+		priv->dev->if_hwassist |= CSUM_TSO;
+	}
 #endif
 #endif
 	priv->dev->if_capabilities |=