From owner-svn-src-head@freebsd.org Tue Mar 22 23:59:52 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 234E899A1B8; Tue, 22 Mar 2016 23:59:52 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-ob0-f170.google.com (mail-ob0-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E90B11FEF; Tue, 22 Mar 2016 23:59:51 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-ob0-f170.google.com with SMTP id m7so212627229obh.3; Tue, 22 Mar 2016 16:59:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :date:message-id:subject:from:to:cc; bh=5ZoLTavnlhOlvvlonz3U6ePT93zpiMPSrEA2Za4CjFk=; b=NzQHO7037wjPW4NzX3kQHMU/MCQQvmIBArEsCxfrYtpgZBG0uuzXUhvS3OXj/wozOp DhhI9pdSWVdGSO9qyMSxPj/t9rhnz81FSYOekhTng8Ir646dPNiuL3r2epumnvlu4RnB upsDG4Al0TR8UPabVAwNuCYj0giVvegG0xwcpNa2ZWf6y96iTRWhMaSkzXWIPQe3m+pn CMePiQQ4WzPlIQoBso23uFm48uzhUJcEf1A7p41OUW83avgkLJRa7XVBJfO8RXsaVrfQ rv3OifKy7+GKBapYFFZshX9RPiyroDsP+oOfMGXZM7JpBQ4YSXQwrG6OKYoGRVUG5WEm OaOA== X-Gm-Message-State: AD7BkJL6kFt8UbmrdeeU4Zjg2Km4EUVfrCK8c8ukaFwxsMZfuMoHaY2eL1QiUPbguZnc8g== X-Received: by 10.182.85.132 with SMTP id h4mr21440482obz.51.1458691184850; Tue, 22 Mar 2016 16:59:44 -0700 (PDT) Received: from mail-oi0-f41.google.com (mail-oi0-f41.google.com. [209.85.218.41]) by smtp.gmail.com with ESMTPSA id du1sm14266912oeb.9.2016.03.22.16.59.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Mar 2016 16:59:44 -0700 (PDT) Received: by mail-oi0-f41.google.com with SMTP id i17so28664521oib.1; Tue, 22 Mar 2016 16:59:44 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.202.222.5 with SMTP id v5mr22065130oig.82.1458691184279; Tue, 22 Mar 2016 16:59:44 -0700 (PDT) Reply-To: cem@FreeBSD.org Received: by 10.157.36.202 with HTTP; Tue, 22 Mar 2016 16:59:44 -0700 (PDT) In-Reply-To: <201603221555.u2MFtHgt068663@repo.freebsd.org> References: <201603221555.u2MFtHgt068663@repo.freebsd.org> Date: Tue, 22 Mar 2016 16:59:44 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r297193 - head/sys/netinet From: Conrad Meyer To: "Jonathan T. Looney" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Mar 2016 23:59:52 -0000 On Tue, Mar 22, 2016 at 8:55 AM, Jonathan T. Looney 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 */ >