From owner-svn-src-head@FreeBSD.ORG  Sun Nov 16 18:08:01 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DD307DD1;
 Sun, 16 Nov 2014 18:08:01 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C965C3CB;
 Sun, 16 Nov 2014 18:08:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAGI81iO018210;
 Sun, 16 Nov 2014 18:08:01 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAGI81RG018208;
 Sun, 16 Nov 2014 18:08:01 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201411161808.sAGI81RG018208@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
 melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Sun, 16 Nov 2014 18:08:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274588 - head/sys/dev/ixgbe
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.18-1
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: Sun, 16 Nov 2014 18:08:02 -0000

Author: melifaro
Date: Sun Nov 16 18:08:00 2014
New Revision: 274588
URL: https://svnweb.freebsd.org/changeset/base/274588

Log:
  Fix r273112: do not turn DROP_EN by default.
  
  Due to adapter->hw.fc.requested_mode is filled with default value
  after ixgbe_initialize_receive_units(), this leads to enabling
  DROP_EN in most cases.
  
  Tested by:	ae
  MFC after:	1 week

Modified:
  head/sys/dev/ixgbe/ixgbe.c

Modified: head/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- head/sys/dev/ixgbe/ixgbe.c	Sun Nov 16 17:53:48 2014	(r274587)
+++ head/sys/dev/ixgbe/ixgbe.c	Sun Nov 16 18:08:00 2014	(r274588)
@@ -4385,7 +4385,7 @@ ixgbe_initialize_receive_units(struct ad
 		 * this code is moved elsewhere.
 		 */
 		if (adapter->num_queues > 1 &&
-		    adapter->hw.fc.requested_mode == ixgbe_fc_none) {
+		    adapter->fc == ixgbe_fc_none) {
 			srrctl |= IXGBE_SRRCTL_DROP_EN;
 		} else {
 			srrctl &= ~IXGBE_SRRCTL_DROP_EN;