From owner-svn-src-all@freebsd.org Mon Apr 18 15:09:17 2016 Return-Path: Delivered-To: svn-src-all@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 A04FDB134F8 for ; Mon, 18 Apr 2016 15:09:17 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from pmta2.delivery6.ore.mailhop.org (pmta2.delivery6.ore.mailhop.org [54.200.129.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7EB2F168B for ; Mon, 18 Apr 2016 15:09:17 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: 62849c3e-0577-11e6-9fea-b54670b854a5 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 73.34.117.227 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [73.34.117.227]) by outbound2.ore.mailhop.org (Halon Mail Gateway) with ESMTPSA; Mon, 18 Apr 2016 15:08:19 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.14.9) with ESMTP id u3IF87Zu033107; Mon, 18 Apr 2016 09:08:07 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1460992087.52955.47.camel@freebsd.org> Subject: Re: svn commit: r298187 - head/sys/netinet From: Ian Lepore To: Michael Tuexen , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Mon, 18 Apr 2016 09:08:07 -0600 In-Reply-To: <201604180638.u3I6cs5P043229@repo.freebsd.org> References: <201604180638.u3I6cs5P043229@repo.freebsd.org> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.16.5 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 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: Mon, 18 Apr 2016 15:09:17 -0000 On Mon, 2016-04-18 at 06:38 +0000, Michael Tuexen wrote: > Author: tuexen > Date: Mon Apr 18 06:38:53 2016 > New Revision: 298187 > URL: https://svnweb.freebsd.org/changeset/base/298187 > > Log: > Don't use anonymous unions. > Why not? This is one of those commit messages that really needs to say WHY the change is happening more than WHAT is happening. -- Ian > Modified: > head/sys/netinet/sctp_header.h > head/sys/netinet/sctp_indata.c > head/sys/netinet/sctp_output.c > > Modified: head/sys/netinet/sctp_header.h > ===================================================================== > ========= > --- head/sys/netinet/sctp_header.h Mon Apr 18 06:32:24 2016 > (r298186) > +++ head/sys/netinet/sctp_header.h Mon Apr 18 06:38:53 2016 > (r298187) > @@ -160,7 +160,7 @@ struct sctp_idata { > union { > uint32_t protocol_id; > uint32_t fsn; /* Fragment Sequence Number */ > - }; > + } ppid_fsn; > /* user data follows */ > } SCTP_PACKED; > > > Modified: head/sys/netinet/sctp_indata.c > ===================================================================== > ========= > --- head/sys/netinet/sctp_indata.c Mon Apr 18 06:32:24 2016 > (r298186) > +++ head/sys/netinet/sctp_indata.c Mon Apr 18 06:38:53 2016 > (r298187) > @@ -1558,7 +1558,7 @@ sctp_process_a_data_chunk(struct sctp_tc > if (ch->ch.chunk_flags & SCTP_DATA_FIRST_FRAG) > fsn = 0; > else > - fsn = ntohl(nch->dp.fsn); > + fsn = ntohl(nch->dp.ppid_fsn.fsn); > old_data = 0; > } else { > ch = (struct sctp_data_chunk *)sctp_m_getptr(*m, > offset, > > Modified: head/sys/netinet/sctp_output.c > ===================================================================== > ========= > --- head/sys/netinet/sctp_output.c Mon Apr 18 06:32:24 2016 > (r298186) > +++ head/sys/netinet/sctp_output.c Mon Apr 18 06:38:53 2016 > (r298187) > @@ -7641,9 +7641,9 @@ dont_do_it: > ndchkh->dp.reserved = htons(0); > ndchkh->dp.msg_id = htonl(sp->msg_id); > if (sp->fsn == 0) > - ndchkh->dp.protocol_id = chk > ->rec.data.payloadtype; > + ndchkh->dp.ppid_fsn.protocol_id = chk > ->rec.data.payloadtype; > else > - ndchkh->dp.fsn = htonl(sp->fsn); > + ndchkh->dp.ppid_fsn.fsn = htonl(sp->fsn); > sp->fsn++; > ndchkh->ch.chunk_length = htons(chk->send_size); > } >