From owner-svn-src-all@freebsd.org Thu Jul 11 11:50:15 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA0D715CFC5C; Thu, 11 Jul 2019 11:50:14 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 8E0EE735E8; Thu, 11 Jul 2019 11:50:13 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id lXaOhJyiyUIS2lXaPhaTn7; Thu, 11 Jul 2019 05:50:06 -0600 X-Authority-Analysis: v=2.3 cv=N41X6F1B c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=0o9FgrsRnhwA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=SQCxYW1kktpyUpVo5akA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 8176E64B; Thu, 11 Jul 2019 04:50:03 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id x6BBo3QI009399; Thu, 11 Jul 2019 04:50:03 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id x6BBo3YA009396; Thu, 11 Jul 2019 04:50:03 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201907111150.x6BBo3YA009396@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Randall Stewart cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r349907 - head/sys/netinet/tcp_stacks In-Reply-To: Message from Randall Stewart of "Thu, 11 Jul 2019 04:38:33 -0000." <201907110438.x6B4cXX1054795@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 11 Jul 2019 04:50:03 -0700 X-CMAE-Envelope: MS4wfNcC15S+wst+a8nn/j4/R45govZRPfnQFvJHfozHgExSW3XI0SzBH9oWda9PaGJDDmCI62c9+nf5Dv24KHEGpp9U/ZwAWOxMBILlnGm90EOTbcSa0+ln 4Ij/sJ20x8i0UJ18elyCGmRtyWYyZ9qb/wib99J/mpKiretBNY6PsK3S691kYLlYhKaCbsFL7QTbIdTRdDRr1sNl3kyMkQT6ynWAd1RJ0wHp2TDOESyRQdxP hPxxKQeD3xLLS/GNdok1yoJCjDxGjPfjh73Kz4v5ywfckes6TaENS0FN46pvjlMA X-Rspamd-Queue-Id: 8E0EE735E8 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-5.01 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_DN_SOME(0.00)[]; REPLYTO_EQ_FROM(0.00)[]; IP_SCORE(-2.51)[ip: (-6.69), ipnet: 64.59.128.0/20(-3.25), asn: 6327(-2.53), country: CA(-0.09)]; MX_GOOD(-0.01)[cached: spqr.komquats.com]; NEURAL_HAM_SHORT(-0.89)[-0.888,0]; RCVD_IN_DNSWL_NONE(0.00)[9.134.59.64.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_SPF_NA(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[17.125.67.70.zen.spamhaus.org : 127.0.0.11]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; RCVD_TLS_LAST(0.00)[]; FROM_EQ_ENVFROM(0.00)[] 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jul 2019 11:50:15 -0000 In message <201907110438.x6B4cXX1054795@repo.freebsd.org>, Randall Stewart writ es: > Author: rrs > Date: Thu Jul 11 04:38:33 2019 > New Revision: 349907 > URL: https://svnweb.freebsd.org/changeset/base/349907 > > Log: > Update copyright per JBH's suggestions.. thanks. > > Modified: > head/sys/netinet/tcp_stacks/rack.c > > Modified: head/sys/netinet/tcp_stacks/rack.c > ============================================================================= > = > --- head/sys/netinet/tcp_stacks/rack.c Thu Jul 11 03:29:25 2019 > (r349906) > +++ head/sys/netinet/tcp_stacks/rack.c Thu Jul 11 04:38:33 2019 > (r349907) > @@ -1,5 +1,5 @@ > /*- > - * Copyright (c) 2016 > + * Copyright (c) 2016-2019 > * Netflix Inc. All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > @@ -8537,10 +8537,10 @@ out: > * retransmit. In persist state, just set snd_max. > */ > if (error == 0) { > -/* if (TCPS_HAVEESTABLISHED(tp->t_state) && > + if (TCPS_HAVEESTABLISHED(tp->t_state) && > (tp->t_flags & TF_SACK_PERMIT) && > tp->rcv_numsacks > 0) > - tcp_clean_dsack_blocks(tp);*/ > + tcp_clean_dsack_blocks(tp); > if (len == 0) > counter_u64_add(rack_out_size[TCP_MSS_ACCT_SNDACK], 1); > else if (len == 1) { > This commit updates more than just the copyright. Were the other changes intended? If yes, a) Removing the */ at the other end of the commented block is also needed. b) The commit log is incorrect. Let's revert this and try again. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.