From owner-svn-src-all@FreeBSD.ORG  Tue Sep  3 23:34:05 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 5C10DA24;
 Tue,  3 Sep 2013 23:34:05 +0000 (UTC) (envelope-from np@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 48B5B2563;
 Tue,  3 Sep 2013 23:34:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r83NY5MJ002637;
 Tue, 3 Sep 2013 23:34:05 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r83NY5L8002636;
 Tue, 3 Sep 2013 23:34:05 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201309032334.r83NY5L8002636@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Tue, 3 Sep 2013 23:34:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255198 - head/sys/dev/cxgbe/tom
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Tue, 03 Sep 2013 23:34:05 -0000

Author: np
Date: Tue Sep  3 23:34:04 2013
New Revision: 255198
URL: http://svnweb.freebsd.org/changeset/base/255198

Log:
  For TOE connections, the window scale factor in CPL_PASS_ACCEPT_REQ is
  set to 15 to indicate that the peer did not send a window scale option
  with its SYN.  Do not send a window scale option in the SYN|ACK reply
  in that case.

Modified:
  head/sys/dev/cxgbe/tom/t4_listen.c

Modified: head/sys/dev/cxgbe/tom/t4_listen.c
==============================================================================
--- head/sys/dev/cxgbe/tom/t4_listen.c	Tue Sep  3 23:20:03 2013	(r255197)
+++ head/sys/dev/cxgbe/tom/t4_listen.c	Tue Sep  3 23:34:04 2013	(r255198)
@@ -1007,7 +1007,7 @@ calc_opt2p(struct adapter *sc, struct po
 			opt2 |= F_TSTAMPS_EN;
 		if (tcpopt->sack)
 			opt2 |= F_SACK_EN;
-		if (tcpopt->wsf > 0)
+		if (tcpopt->wsf <= 14)
 			opt2 |= F_WND_SCALE_EN;
 	}