svn commit: r297193 - head/sys/netinet

[Conrad Meyer]

On Tue, Mar 22, 2016 at 8:55 AM, Jonathan T. Looney <jtl at freebsd.org> wrote:
> Author: jtl
> Date: Tue Mar 22 15:55:17 2016
> New Revision: 297193
> URL: https://svnweb.freebsd.org/changeset/base/297193
>
> ...
>
>   MFC after:    2 weeks

This change seems like it would be ineligible for a MFC due to
changing the ABI of struct tcpopt.

Best,
Conrad

>
> Modified:
>   head/sys/netinet/tcp_output.c
>   head/sys/netinet/tcp_var.h
>
> Modified: head/sys/netinet/tcp_output.c
> ==============================================================================
> --- head/sys/netinet/tcp_output.c       Tue Mar 22 15:43:47 2016        (r297192)
> +++ head/sys/netinet/tcp_output.c       Tue Mar 22 15:55:17 2016        (r297193)
> @@ -1652,7 +1652,7 @@ tcp_setpersist(struct tcpcb *tp)
>  int
>  tcp_addoptions(struct tcpopt *to, u_char *optp)
>  {
> -       u_int mask, optlen = 0;
> +       u_int32_t mask, optlen = 0;
>
>         for (mask = 1; mask < TOF_MAXOPT; mask <<= 1) {
>                 if ((to->to_flags & mask) != mask)
>
> Modified: head/sys/netinet/tcp_var.h
> ==============================================================================
> --- head/sys/netinet/tcp_var.h  Tue Mar 22 15:43:47 2016        (r297192)
> +++ head/sys/netinet/tcp_var.h  Tue Mar 22 15:55:17 2016        (r297193)
> @@ -364,7 +364,7 @@ struct tcpcb {
>   * options in tcp_addoptions.
>   */
>  struct tcpopt {
> -       u_int64_t       to_flags;       /* which options are present */
> +       u_int32_t       to_flags;       /* which options are present */
>  #define        TOF_MSS         0x0001          /* maximum segment size */
>  #define        TOF_SCALE       0x0002          /* window scaling */
>  #define        TOF_SACKPERM    0x0004          /* SACK permitted */
>