From owner-svn-src-all@freebsd.org Mon Apr 18 06:38:55 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 68D5FB11B8B; Mon, 18 Apr 2016 06:38:55 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (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 1F2471D80; Mon, 18 Apr 2016 06:38:55 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3I6cs7Z043232; Mon, 18 Apr 2016 06:38:54 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3I6cs5P043229; Mon, 18 Apr 2016 06:38:54 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201604180638.u3I6cs5P043229@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Mon, 18 Apr 2016 06:38:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298187 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 06:38:55 -0000 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. 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); }