From owner-svn-src-head@FreeBSD.ORG  Thu Jul 25 16:34:34 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E03DC2B7;
 Thu, 25 Jul 2013 16:34:34 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CD7FF22C3;
 Thu, 25 Jul 2013 16:34:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6PGYYW9097084;
 Thu, 25 Jul 2013 16:34:34 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6PGYYJE097083;
 Thu, 25 Jul 2013 16:34:34 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201307251634.r6PGYYJE097083@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 25 Jul 2013 16:34:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253653 - head/sys/ofed/drivers/net/mlx4
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Jul 2013 16:34:35 -0000

Author: jhb
Date: Thu Jul 25 16:34:34 2013
New Revision: 253653
URL: http://svnweb.freebsd.org/changeset/base/253653

Log:
  Avoid trashing IP fragments:
  - Only enable UDP/TCP hardware checksums if CSUM_UDP or CSUM_TCP is set.
  - Only enable IP hardware checksums if CSUM_IP is set.
  
  PR:		kern/180430
  Submitted by:	Meny Yossefi <menyy@mellanox.com>
  MFC after:	1 week

Modified:
  head/sys/ofed/drivers/net/mlx4/en_tx.c

Modified: head/sys/ofed/drivers/net/mlx4/en_tx.c
==============================================================================
--- head/sys/ofed/drivers/net/mlx4/en_tx.c	Thu Jul 25 16:04:55 2013	(r253652)
+++ head/sys/ofed/drivers/net/mlx4/en_tx.c	Thu Jul 25 16:34:34 2013	(r253653)
@@ -780,8 +780,12 @@ retry:
 	tx_desc->ctrl.srcrb_flags = cpu_to_be32(MLX4_WQE_CTRL_CQ_UPDATE |
 						MLX4_WQE_CTRL_SOLICITED);
 	if (mb->m_pkthdr.csum_flags & (CSUM_IP|CSUM_TCP|CSUM_UDP)) {
-		tx_desc->ctrl.srcrb_flags |= cpu_to_be32(MLX4_WQE_CTRL_IP_CSUM |
-							 MLX4_WQE_CTRL_TCP_UDP_CSUM);
+		if (mb->m_pkthdr.csum_flags & CSUM_IP)
+			tx_desc->ctrl.srcrb_flags |=
+			    cpu_to_be32(MLX4_WQE_CTRL_IP_CSUM);
+		if (mb->m_pkthdr.csum_flags & (CSUM_TCP|CSUM_UDP))
+			tx_desc->ctrl.srcrb_flags |=
+			    cpu_to_be32(MLX4_WQE_CTRL_TCP_UDP_CSUM);
 		priv->port_stats.tx_chksum_offload++;
 	}