Date: Fri, 10 Aug 2018 21:03:17 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> 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 Message-ID: <201808102103.w7AL3Hnp016675@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 +=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808102103.w7AL3Hnp016675>