From owner-svn-src-head@FreeBSD.ORG  Mon Mar 23 15:53:27 2015
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 22CD4B17;
 Mon, 23 Mar 2015 15:53:27 +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 0E44C12F;
 Mon, 23 Mar 2015 15:53:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2NFrQom050888;
 Mon, 23 Mar 2015 15:53:26 GMT (envelope-from arybchik@FreeBSD.org)
Received: (from arybchik@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2NFrQ8u050887;
 Mon, 23 Mar 2015 15:53:26 GMT (envelope-from arybchik@FreeBSD.org)
Message-Id: <201503231553.t2NFrQ8u050887@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: arybchik set sender to
 arybchik@FreeBSD.org using -f
From: Andrew Rybchenko <arybchik@FreeBSD.org>
Date: Mon, 23 Mar 2015 15:53:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280380 - head/sys/dev/sfxge
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: Mon, 23 Mar 2015 15:53:27 -0000

Author: arybchik
Date: Mon Mar 23 15:53:26 2015
New Revision: 280380
URL: https://svnweb.freebsd.org/changeset/base/280380

Log:
  sfxge: remove unnecessary and wrong prediction
  
  Sponsored by:   Solarflare Communications, Inc.
  Differential Revision: https://reviews.freebsd.org/D2085

Modified:
  head/sys/dev/sfxge/sfxge_port.c

Modified: head/sys/dev/sfxge/sfxge_port.c
==============================================================================
--- head/sys/dev/sfxge/sfxge_port.c	Mon Mar 23 15:52:57 2015	(r280379)
+++ head/sys/dev/sfxge/sfxge_port.c	Mon Mar 23 15:53:26 2015	(r280380)
@@ -241,7 +241,7 @@ sfxge_port_wanted_fc_handler(SYSCTL_HAND
 		SFXGE_PORT_LOCK(port);
 
 		if (port->wanted_fc != fcntl) {
-		    if (__predict_false(port->init_state == SFXGE_PORT_STARTED))
+			if (port->init_state == SFXGE_PORT_STARTED)
 				error = efx_mac_fcntl_set(sc->enp,
 							  port->wanted_fc,
 							  B_TRUE);