From owner-svn-src-stable-9@FreeBSD.ORG  Wed Mar  6 08:03:27 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 51F47545;
 Wed,  6 Mar 2013 08:03:27 +0000 (UTC)
 (envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 445E48D8;
 Wed,  6 Mar 2013 08:03:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2683R3F029661;
 Wed, 6 Mar 2013 08:03:27 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2683RC0029658;
 Wed, 6 Mar 2013 08:03:27 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201303060803.r2683RC0029658@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Wed, 6 Mar 2013 08:03:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r247872 - stable/9/sys/dev/msk
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Mar 2013 08:03:27 -0000

Author: yongari
Date: Wed Mar  6 08:03:26 2013
New Revision: 247872
URL: http://svnweb.freebsd.org/changeset/base/247872

Log:
  MFC r247382:
    RX checksum offloading on old Yukon controllers seem to cause more
    problems.  Disable RX checksum offloading on controllers that don't
    use new descriptor format but give chance to enable it with
    ifconfig(8).

Modified:
  stable/9/sys/dev/msk/if_msk.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/msk/if_msk.c
==============================================================================
--- stable/9/sys/dev/msk/if_msk.c	Wed Mar  6 07:28:20 2013	(r247871)
+++ stable/9/sys/dev/msk/if_msk.c	Wed Mar  6 08:03:26 2013	(r247872)
@@ -1696,6 +1696,12 @@ msk_attach(device_t dev)
 			ifp->if_capabilities |= IFCAP_VLAN_HWCSUM;
 	}
 	ifp->if_capenable = ifp->if_capabilities;
+	/*
+	 * Disable RX checksum offloading on controllers that don't use
+	 * new descriptor format but give chance to enable it.
+	 */
+	if ((sc_if->msk_flags & MSK_FLAG_DESCV2) == 0)
+		ifp->if_capenable &= ~IFCAP_RXCSUM;
 
 	/*
 	 * Tell the upper layer(s) we support long frames.