Re: svn commit: r349907 - head/sys/netinet/tcp_stacks

2019-07-12 Thread Randall Stewart via svn-src-all
opps.. that was a error on my part I will fix it :)


> On Jul 11, 2019, at 4:37 AM, Enji Cooper  wrote:
> 
> 
>> On Jul 10, 2019, at 9:38 PM, Randall Stewart  wrote:
>> 
>> 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);
> 
>   Removing this commented out code unfortunately broke the build: 
> https://ci.freebsd.org/job/FreeBSD-head-amd64-LINT/12934/console .
> Thanks,
> -Enji
> 

--
Randall Stewart
r...@netflix.com



___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r349907 - head/sys/netinet/tcp_stacks

2019-07-11 Thread Cy Schubert
Cy Schubert writes:
> In message <201907110438.x6b4cxx1054...@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.

My mistake. I missed the */. Sorry.

> b) The commit log is incorrect.

This is still a problem.

>
> Let's revert this and try again.

For the sake of the log, probably.


-- 
Cheers,
Cy Schubert 
FreeBSD UNIX: Web:  http://www.FreeBSD.org

The need of the many outweighs the greed of the few.


___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r349907 - head/sys/netinet/tcp_stacks

2019-07-11 Thread Cy Schubert
In message <201907110438.x6b4cxx1054...@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.cThu Jul 11 03:29:25 2019
>   (r349906)
> +++ head/sys/netinet/tcp_stacks/rack.cThu 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.


___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r349907 - head/sys/netinet/tcp_stacks

2019-07-11 Thread Enji Cooper


> On Jul 10, 2019, at 9:38 PM, Randall Stewart  wrote:
> 
> 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.cThu Jul 11 03:29:25 2019
> (r349906)
> +++ head/sys/netinet/tcp_stacks/rack.cThu 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);

Removing this commented out code unfortunately broke the build: 
https://ci.freebsd.org/job/FreeBSD-head-amd64-LINT/12934/console 
 .
Thanks,
-Enji

___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


svn commit: r349907 - head/sys/netinet/tcp_stacks

2019-07-10 Thread Randall Stewart
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) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"