From owner-svn-src-head@freebsd.org  Sat Dec 21 11:38:48 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 DFB111D123B;
 Sat, 21 Dec 2019 11:38:48 +0000 (UTC)
 (envelope-from arrowd@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 47g3Xm5czmz49jn;
 Sat, 21 Dec 2019 11:38:48 +0000 (UTC)
 (envelope-from arrowd@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 BC4B1EC2D;
 Sat, 21 Dec 2019 11:38:48 +0000 (UTC)
 (envelope-from arrowd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBLBcmqm001608;
 Sat, 21 Dec 2019 11:38:48 GMT (envelope-from arrowd@FreeBSD.org)
Received: (from arrowd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBLBcmhQ001607;
 Sat, 21 Dec 2019 11:38:48 GMT (envelope-from arrowd@FreeBSD.org)
Message-Id: <201912211138.xBLBcmhQ001607@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arrowd set sender to
 arrowd@FreeBSD.org using -f
From: Gleb Popov <arrowd@FreeBSD.org>
Date: Sat, 21 Dec 2019 11:38:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r355980 - head/sys/contrib/ncsw/Peripherals/QM
X-SVN-Group: head
X-SVN-Commit-Author: arrowd
X-SVN-Commit-Paths: head/sys/contrib/ncsw/Peripherals/QM
X-SVN-Commit-Revision: 355980
X-SVN-Commit-Repository: base
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.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Dec 2019 11:38:48 -0000

Author: arrowd (ports committer)
Date: Sat Dec 21 11:38:48 2019
New Revision: 355980
URL: https://svnweb.freebsd.org/changeset/base/355980

Log:
  Don't shift 32-bit value by more than 32 bits.
  
  PR:		207854
  Approved by:	emaste

Modified:
  head/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c

Modified: head/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c
==============================================================================
--- head/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c	Sat Dec 21 07:38:14 2019	(r355979)
+++ head/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c	Sat Dec 21 11:38:48 2019	(r355980)
@@ -1468,7 +1468,7 @@ static t_Error CalcWredCurve(t_QmCgWredCurve *p_WredCu
     for (tmpA=(uint32_t)(64*pres) ; tmpA<128*pres; tmpA += pres )
         for (tmpN=7 ; tmpN<64; tmpN++ )
         {
-            tmp = ABS((int)(slope - tmpA/(1<<tmpN)));
+            tmp = ABS((int)(slope - tmpA/(1UL<<(tmpN%32))));
             if (tmp < gap)
             {
                sa = tmpA;