From owner-svn-src-all@FreeBSD.ORG  Mon May  2 23:34:34 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 26AF5106566B;
	Mon,  2 May 2011 23:34:34 +0000 (UTC)
	(envelope-from davidch@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1624C8FC14;
	Mon,  2 May 2011 23:34:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p42NYX0Q059467;
	Mon, 2 May 2011 23:34:33 GMT (envelope-from davidch@svn.freebsd.org)
Received: (from davidch@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p42NYXNf059465;
	Mon, 2 May 2011 23:34:33 GMT (envelope-from davidch@svn.freebsd.org)
Message-Id: <201105022334.p42NYXNf059465@svn.freebsd.org>
From: David Christensen <davidch@FreeBSD.org>
Date: Mon, 2 May 2011 23:34:33 +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: r221354 - head/sys/dev/bxe
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: Mon, 02 May 2011 23:34:34 -0000

Author: davidch
Date: Mon May  2 23:34:33 2011
New Revision: 221354
URL: http://svn.freebsd.org/changeset/base/221354

Log:
  - Fixed a typo in an if() statement when setting flow control for MTU
    greater than 5000 bytes.
  
  Submitted by:	yongari

Modified:
  head/sys/dev/bxe/if_bxe.c

Modified: head/sys/dev/bxe/if_bxe.c
==============================================================================
--- head/sys/dev/bxe/if_bxe.c	Mon May  2 22:54:24 2011	(r221353)
+++ head/sys/dev/bxe/if_bxe.c	Mon May  2 23:34:33 2011	(r221354)
@@ -3600,7 +3600,7 @@ bxe_initial_phy_init(struct bxe_softc *s
 		 * It is recommended to turn off RX flow control for 5771x
 		 * when using jumbo frames for better performance.
 		 */
-		if (!IS_E1HMF(sc) & (sc->mbuf_alloc_size > 5000))
+		if (!IS_E1HMF(sc) && (sc->mbuf_alloc_size > 5000))
 			sc->link_params.req_fc_auto_adv = FLOW_CTRL_TX;
 		else
 			sc->link_params.req_fc_auto_adv = FLOW_CTRL_BOTH;