From owner-svn-src-all@freebsd.org Sat Oct 24 10:46:45 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F407D444D0E; Sat, 24 Oct 2020 10:46:44 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CJHpX3QCVz4NhB; Sat, 24 Oct 2020 10:46:44 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.16.1/8.16.1) with ESMTPS id 09OAkSVP048836 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 24 Oct 2020 13:46:31 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 09OAkSVP048836 Received: (from kostik@localhost) by tom.home (8.16.1/8.16.1/Submit) id 09OAkSGs048835; Sat, 24 Oct 2020 13:46:28 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 24 Oct 2020 13:46:28 +0300 From: Konstantin Belousov To: Hans Petter Selasky Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r366993 - head/sys/net Message-ID: <20201024104628.GB2643@kib.kiev.ua> References: <202010241023.09OANMcL075640@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202010241023.09OANMcL075640@repo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 4CJHpX3QCVz4NhB X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 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: Sat, 24 Oct 2020 10:46:45 -0000 On Sat, Oct 24, 2020 at 10:23:22AM +0000, Hans Petter Selasky wrote: > Author: hselasky > Date: Sat Oct 24 10:23:21 2020 > New Revision: 366993 > URL: https://svnweb.freebsd.org/changeset/base/366993 > > Log: > Run code through "clang-format -style=file" with some additional fixes. > No functional change. > > Suggested by: kib@ and emaste@ > Differential Revision: https://reviews.freebsd.org/D26254 > MFC after: 1 week > Sponsored by: Mellanox Technologies // NVIDIA Networking > > Modified: > head/sys/net/if_infiniband.c > > Modified: head/sys/net/if_infiniband.c > ============================================================================== > --- head/sys/net/if_infiniband.c Sat Oct 24 05:52:29 2020 (r366992) > +++ head/sys/net/if_infiniband.c Sat Oct 24 10:23:21 2020 (r366993) > @@ -30,44 +30,42 @@ > __FBSDID("$FreeBSD$"); > > #include > -#include > -#include > -#include sys/systm.h should come right after sys/param.h. These two headers are exceptions to the normal alphabetical rule. > +#include > #include > +#include > +#include > +#include > #include > #include > -#include > -#include > +#include > > -#include > -#include > -#include > +#include > #include > #include > -#include > -#include > -#include > +#include > +#include > #include > -#include > #include > #include > - > -#include > +#include > +#include > +#include > +#include > #include > +#include > #include > - > #include > #include > > #include > > /* if_lagg(4) support */ > -struct mbuf *(*lagg_input_infiniband_p)(struct ifnet *, struct mbuf *); > +struct mbuf *(*lagg_input_infiniband_p)(struct ifnet *, struct mbuf *); > > #ifdef INET > static inline void > -infiniband_ipv4_multicast_map(uint32_t addr, > - const uint8_t *broadcast, uint8_t *buf) > +infiniband_ipv4_multicast_map( > + uint32_t addr, const uint8_t *broadcast, uint8_t *buf) And this is arguably regression, we fill line up to columns 72-80 before splitting to the continuation line. > { > uint8_t scope; > > @@ -99,8 +97,8 @@ infiniband_ipv4_multicast_map(uint32_t addr, > > #ifdef INET6 > static inline void > -infiniband_ipv6_multicast_map(const struct in6_addr *addr, > - const uint8_t *broadcast, uint8_t *buf) > +infiniband_ipv6_multicast_map( > + const struct in6_addr *addr, const uint8_t *broadcast, uint8_t *buf) > { > uint8_t scope; > > @@ -128,7 +126,7 @@ infiniband_bpf_mtap(struct ifnet *ifp, struct mbuf *mb > { > struct infiniband_header *ibh; > struct ether_header eh; > - > + > if (mb->m_len < sizeof(*ibh)) > return; > > @@ -198,7 +196,7 @@ infiniband_output(struct ifnet *ifp, struct mbuf *m, c > if (error) { > if (error == EWOULDBLOCK) > error = 0; > - m = NULL; /* mbuf is consumed by resolver */ > + m = NULL; /* mbuf is consumed by resolver */ This is a regression as well, in-line comment is typically preceeded by tab. > goto bad; > } > } > @@ -265,7 +263,7 @@ infiniband_output(struct ifnet *ifp, struct mbuf *m, c > if (error) { > if (error == EWOULDBLOCK) > error = 0; > - m = NULL; /* mbuf is consumed by resolver */ > + m = NULL; /* mbuf is consumed by resolver */ > goto bad; > } > } > @@ -410,8 +408,8 @@ done: > } > > static int > -infiniband_resolvemulti(struct ifnet *ifp, struct sockaddr **llsa, > - struct sockaddr *sa) > +infiniband_resolvemulti( > + struct ifnet *ifp, struct sockaddr **llsa, struct sockaddr *sa) > { > struct sockaddr_dl *sdl; > #ifdef INET > @@ -442,8 +440,8 @@ infiniband_resolvemulti(struct ifnet *ifp, struct sock > sdl = link_init_sdl(ifp, *llsa, IFT_INFINIBAND); > sdl->sdl_alen = INFINIBAND_ADDR_LEN; > e_addr = LLADDR(sdl); > - infiniband_ipv4_multicast_map(sin->sin_addr.s_addr, ifp->if_broadcastaddr, > - e_addr); > + infiniband_ipv4_multicast_map( > + sin->sin_addr.s_addr, ifp->if_broadcastaddr, e_addr); > *llsa = (struct sockaddr *)sdl; > return (0); > #endif > @@ -462,7 +460,8 @@ infiniband_resolvemulti(struct ifnet *ifp, struct sock > sdl = link_init_sdl(ifp, *llsa, IFT_INFINIBAND); > sdl->sdl_alen = INFINIBAND_ADDR_LEN; > e_addr = LLADDR(sdl); > - infiniband_ipv6_multicast_map(&sin6->sin6_addr, ifp->if_broadcastaddr, e_addr); > + infiniband_ipv6_multicast_map( > + &sin6->sin6_addr, ifp->if_broadcastaddr, e_addr); > *llsa = (struct sockaddr *)sdl; > return (0); > #endif > @@ -487,7 +486,7 @@ infiniband_ifattach(struct ifnet *ifp, const uint8_t * > ifp->if_resolvemulti = infiniband_resolvemulti; > > if (ifp->if_baudrate == 0) > - ifp->if_baudrate = IF_Gbps(10); /* default value */ > + ifp->if_baudrate = IF_Gbps(10); /* default value */ > if (llb != NULL) > ifp->if_broadcastaddr = llb; >