From owner-svn-src-projects@freebsd.org Fri Aug 10 21:03:19 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4282410750B4 for ; Fri, 10 Aug 2018 21:03:19 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DF27D7B173; Fri, 10 Aug 2018 21:03:18 +0000 (UTC) (envelope-from dim@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BD2A25A86; Fri, 10 Aug 2018 21:03:18 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7AL3IjZ016678; Fri, 10 Aug 2018 21:03:18 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7AL3Hnp016675; Fri, 10 Aug 2018 21:03:17 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201808102103.w7AL3Hnp016675@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Fri, 10 Aug 2018 21:03:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r337591 - in projects/clang700-import/sys: dev/cx i386/include net80211 netinet X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in projects/clang700-import/sys: dev/cx i386/include net80211 netinet X-SVN-Commit-Revision: 337591 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Aug 2018 21:03:19 -0000 Author: dim Date: Fri Aug 10 21:03:17 2018 New Revision: 337591 URL: https://svnweb.freebsd.org/changeset/base/337591 Log: Merge ^/head r337586 through r337590. Modified: projects/clang700-import/sys/dev/cx/cxddk.c projects/clang700-import/sys/i386/include/cserial.h projects/clang700-import/sys/net80211/ieee80211_hwmp.c projects/clang700-import/sys/netinet/sctp_indata.c Directory Properties: projects/clang700-import/ (props changed) Modified: projects/clang700-import/sys/dev/cx/cxddk.c ============================================================================== --- projects/clang700-import/sys/dev/cx/cxddk.c Fri Aug 10 21:02:28 2018 (r337590) +++ projects/clang700-import/sys/dev/cx/cxddk.c Fri Aug 10 21:03:17 2018 (r337591) @@ -215,7 +215,7 @@ void cx_enable_receive (cx_chan_t *c, int on) } /* - * Turn the transmiter on/off. + * Turn the transmitter on/off. */ void cx_enable_transmit (cx_chan_t *c, int on) { Modified: projects/clang700-import/sys/i386/include/cserial.h ============================================================================== --- projects/clang700-import/sys/i386/include/cserial.h Fri Aug 10 21:02:28 2018 (r337590) +++ projects/clang700-import/sys/i386/include/cserial.h Fri Aug 10 21:03:17 2018 (r337591) @@ -89,7 +89,7 @@ struct e3_statistics { #define ER_SCC_FRAMING 7 /* subchannel framing error */ #define ER_SCC_OVERFLOW 8 /* subchannel receive buffer overflow */ #define ER_SCC_OVERRUN 9 /* subchannel receiver overrun */ -#define ER_SCC_UNDERRUN 10 /* subchannel transmiter underrun */ +#define ER_SCC_UNDERRUN 10 /* subchannel transmitter underrun */ #define ER_BUS 11 /* system bus is too busy (e.g PCI) */ /* Modified: projects/clang700-import/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/clang700-import/sys/net80211/ieee80211_hwmp.c Fri Aug 10 21:02:28 2018 (r337590) +++ projects/clang700-import/sys/net80211/ieee80211_hwmp.c Fri Aug 10 21:03:17 2018 (r337591) @@ -920,7 +920,7 @@ hwmp_update_transmitter(struct ieee80211vap *vap, stru rttran->rt_metric > metric) { IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni, - "%s path to transmiter %6D of %s, metric %d:%d", + "%s path to transmitter %6D of %s, metric %d:%d", rttran->rt_flags & IEEE80211_MESHRT_FLAGS_VALID ? "prefer" : "update", ni->ni_macaddr, ":", hwmp_frame, rttran->rt_metric, metric); Modified: projects/clang700-import/sys/netinet/sctp_indata.c ============================================================================== --- projects/clang700-import/sys/netinet/sctp_indata.c Fri Aug 10 21:02:28 2018 (r337590) +++ projects/clang700-import/sys/netinet/sctp_indata.c Fri Aug 10 21:03:17 2018 (r337591) @@ -3078,7 +3078,7 @@ sctp_process_segment_range(struct sctp_tcb *stcb, stru tp1->whoTo->net_ack += tp1->send_size; if (tp1->snd_count < 2) { /*- - * True non-retransmited chunk + * True non-retransmitted chunk */ tp1->whoTo->net_ack2 += tp1->send_size; @@ -4056,7 +4056,7 @@ sctp_express_handle_sack(struct sctp_tcb *stcb, uint32 tp1->whoTo->net_ack += tp1->send_size; if (tp1->snd_count < 2) { /* - * True non-retransmited + * True non-retransmitted * chunk */ tp1->whoTo->net_ack2 += @@ -4676,7 +4676,7 @@ hopeless_peer: if (tp1->snd_count < 2) { /* - * True non-retransmited + * True non-retransmitted * chunk */ tp1->whoTo->net_ack2 +=