From owner-svn-src-all@freebsd.org  Sat Nov 30 20:04:40 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id D165B1B5B9D;
 Sat, 30 Nov 2019 20:04:40 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47QMm85Dkxz4QLT;
 Sat, 30 Nov 2019 20:04:40 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 96FFE389F;
 Sat, 30 Nov 2019 20:04:40 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAUK4e1o048347;
 Sat, 30 Nov 2019 20:04:40 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAUK4ecS048346;
 Sat, 30 Nov 2019 20:04:40 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201911302004.xAUK4ecS048346@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org
 using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Sat, 30 Nov 2019 20:04:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r355246 - stable/11/sys/dev/cxgbe/tom
X-SVN-Group: stable-11
X-SVN-Commit-Author: np
X-SVN-Commit-Paths: stable/11/sys/dev/cxgbe/tom
X-SVN-Commit-Revision: 355246
X-SVN-Commit-Repository: base
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.29
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Nov 2019 20:04:40 -0000

Author: np
Date: Sat Nov 30 20:04:40 2019
New Revision: 355246
URL: https://svnweb.freebsd.org/changeset/base/355246

Log:
  MFC r351446:
  
  cxgbe/t4_tom: Any invalid scaling factor in the hardware's wsf field
  implies that window scaling is not in use.
  
  Sponsored by:	Chelsio Communications

Modified:
  stable/11/sys/dev/cxgbe/tom/t4_listen.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/cxgbe/tom/t4_listen.c
==============================================================================
--- stable/11/sys/dev/cxgbe/tom/t4_listen.c	Sat Nov 30 19:54:45 2019	(r355245)
+++ stable/11/sys/dev/cxgbe/tom/t4_listen.c	Sat Nov 30 20:04:40 2019	(r355246)
@@ -992,7 +992,7 @@ t4opt_to_tcpopt(const struct tcp_options *t4opt, struc
 		to->to_mss = be16toh(t4opt->mss);
 	}
 
-	if (t4opt->wsf) {
+	if (t4opt->wsf > 0 && t4opt->wsf < 15) {
 		to->to_flags |= TOF_SCALE;
 		to->to_wscale = t4opt->wsf;
 	}