From owner-svn-src-all@FreeBSD.ORG  Wed Dec 14 05:34:24 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 81FEB106564A;
	Wed, 14 Dec 2011 05:34:24 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 710558FC13;
	Wed, 14 Dec 2011 05:34:24 +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 pBE5YODA083966;
	Wed, 14 Dec 2011 05:34:24 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBE5YOFC083964;
	Wed, 14 Dec 2011 05:34:24 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201112140534.pBE5YOFC083964@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Wed, 14 Dec 2011 05:34:24 +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: r228491 - head/sys/dev/cxgbe
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: Wed, 14 Dec 2011 05:34:24 -0000

Author: np
Date: Wed Dec 14 05:34:23 2011
New Revision: 228491
URL: http://svn.freebsd.org/changeset/base/228491

Log:
  Do not clobber the ingress queue's congestion setting.
  
  MFC after:	1 month

Modified:
  head/sys/dev/cxgbe/t4_sge.c

Modified: head/sys/dev/cxgbe/t4_sge.c
==============================================================================
--- head/sys/dev/cxgbe/t4_sge.c	Wed Dec 14 04:12:13 2011	(r228490)
+++ head/sys/dev/cxgbe/t4_sge.c	Wed Dec 14 05:34:23 2011	(r228491)
@@ -1187,7 +1187,7 @@ alloc_iq_fl(struct port_info *pi, struct
 		}
 		fl->needed = fl->cap;
 
-		c.iqns_to_fl0congen =
+		c.iqns_to_fl0congen |=
 		    htobe32(V_FW_IQ_CMD_FL0HOSTFCMODE(X_HOSTFCMODE_NONE) |
 			F_FW_IQ_CMD_FL0FETCHRO | F_FW_IQ_CMD_FL0DATARO |
 			F_FW_IQ_CMD_FL0PADEN);