From nobody Mon Apr 10 05:07:57 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvxnB2sVWz44mXH; Mon, 10 Apr 2023 05:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PvxnB18vHz3Q07; Mon, 10 Apr 2023 05:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681103278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DucwUemUKUs956PxeTi8n3WxzClQW2pw8KT0DVSNAN8=; b=OpnWTX3icGsp8gAzARq0QfT9A92g1mAskJsslSANdMmxDCEm+f+q0EH9ITZRnbJCjcI2Yr PZE84fOiEj22Vsuuuu0atSMew0HENdY8ACwmoKL2RoaYEwO9ssd/XEJ5wDy3oH8uCCfsnq Do0IN5ai+6J8V3DV7n2O09uBJstvt9Qlh4F3lNRdS4e05RTT+9yL88RorMNC9GLJbwpdZy fWTfu+WrhBSEzL8Xs9x2d/u53MVgjGehfuUl1Gl/04Xqi+a81bRaZCq2iZlXUnAnMmQz0u PI6zXmOfsBNsam6eGW7QldNsVmO70Zk67UyxQjOCcZFmrRWXzcyovL2d+ty42g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681103278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DucwUemUKUs956PxeTi8n3WxzClQW2pw8KT0DVSNAN8=; b=upjvPuUFemopCdGDkQ9L8t9LKr47kZbWKRmjpw/w/CtGUqFTkcDb6BBxCNIxh3vw+LOvLm rBh1ZHP8e7hQbP/mmBwTQFkes6/y/crDf7CRWtbmzO+s7yr3sqjrAMEJtiYLlfLP8jGOum vjCHUEcxQ8lD+vlrKuO2G9y6wc4ZVggwQGoQmhZ0FYIUOaL94Ie4G8ARllFgwZhjsLNs6P hRUzABiERSdF5y86mxhi6/ZlsxkvrvOrznEO60WgrdvK9CpqQSYkrJAXKhvlqRUixvhbWg TMLNTDQmfafuw3wqEpkuPIrAg4iatVgKz2o9CYfyZYL2pb0r+NghiNH2KG2lDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681103278; a=rsa-sha256; cv=none; b=vJqk0Rp6+drHH11rAObiwKjvqBOSpy8rBvjCFn0RO1mm/v6ESl3DtxehhPCWp1S5Kzik7l HDr2/NYIi6HLIIt8qIAxMEPtPzRIad48iMov2CTetkWBbwnAyYaGsvKdP6pdneaFpAMgLE T+tdV0Hy9fhoO/rTRCwabhMLjaUdoRFCpVAPo/pF8XkKTuQTNLj/XXonDBOhPYT8r2WA4A G5qM6U21GcJRyRsekhIWBCo7cx7JZ6tZCuNOTJdMkfEXLwu0nrOcnNOcHKka+F9VGCk00b CKek5bI50h6sX+kOyws2Fj5t8OaXZqNL/PF4TRGNuKwAp8AFAGFnGp8eoRMUCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pvxn96x1hzcdM; Mon, 10 Apr 2023 05:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33A57vUx022128; Mon, 10 Apr 2023 05:07:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33A57vjG022127; Mon, 10 Apr 2023 05:07:57 GMT (envelope-from git) Date: Mon, 10 Apr 2023 05:07:57 GMT Message-Id: <202304100507.33A57vjG022127@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 731e9e830ff5 - stable/12 - lagg: Various style fixes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 731e9e830ff57193badf4b468869e5c1700015c3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=731e9e830ff57193badf4b468869e5c1700015c3 commit 731e9e830ff57193badf4b468869e5c1700015c3 Author: Zhenlei Huang AuthorDate: 2023-03-24 09:55:15 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-10 05:06:21 +0000 lagg: Various style fixes MFC after: 1 week (cherry picked from commit dcd7f0bd02f407952de42d96e1c2c01ee3460702) (cherry picked from commit 9d1d0667c7fd9955711b39abf17750fd2a9d01fd) --- sys/net/if_lagg.c | 43 +++++++++++++++++++++---------------------- sys/net/if_lagg.h | 2 +- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 6b342167e8e1..9e7a72d7cf0a 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -148,10 +148,10 @@ static int lagg_snd_tag_alloc(struct ifnet *, #endif static int lagg_setmulti(struct lagg_port *); static int lagg_clrmulti(struct lagg_port *); -static int lagg_setcaps(struct lagg_port *, int cap); -static int lagg_setflag(struct lagg_port *, int, int, +static int lagg_setcaps(struct lagg_port *, int cap); +static int lagg_setflag(struct lagg_port *, int, int, int (*func)(struct ifnet *, int)); -static int lagg_setflags(struct lagg_port *, int status); +static int lagg_setflags(struct lagg_port *, int status); static uint64_t lagg_get_counter(struct ifnet *ifp, ift_counter cnt); static int lagg_transmit_ethernet(struct ifnet *, struct mbuf *); static int lagg_transmit_infiniband(struct ifnet *, struct mbuf *); @@ -159,7 +159,7 @@ static void lagg_qflush(struct ifnet *); static int lagg_media_change(struct ifnet *); static void lagg_media_status(struct ifnet *, struct ifmediareq *); static struct lagg_port *lagg_link_active(struct lagg_softc *, - struct lagg_port *); + struct lagg_port *); /* Simple round robin */ static void lagg_rr_attach(struct lagg_softc *); @@ -183,7 +183,7 @@ static struct mbuf *lagg_lb_input(struct lagg_softc *, struct lagg_port *, static int lagg_lb_porttable(struct lagg_softc *, struct lagg_port *); /* Broadcast */ -static int lagg_bcast_start(struct lagg_softc *, struct mbuf *); +static int lagg_bcast_start(struct lagg_softc *, struct mbuf *); static struct mbuf *lagg_bcast_input(struct lagg_softc *, struct lagg_port *, struct mbuf *); @@ -459,7 +459,7 @@ lagg_register_vlan(void *arg, struct ifnet *ifp, u_int16_t vtag) struct lagg_softc *sc = ifp->if_softc; struct lagg_port *lp; - if (ifp->if_softc != arg) /* Not our event */ + if (ifp->if_softc != arg) /* Not our event */ return; LAGG_XLOCK(sc); @@ -478,7 +478,7 @@ lagg_unregister_vlan(void *arg, struct ifnet *ifp, u_int16_t vtag) struct lagg_softc *sc = ifp->if_softc; struct lagg_port *lp; - if (ifp->if_softc != arg) /* Not our event */ + if (ifp->if_softc != arg) /* Not our event */ return; LAGG_XLOCK(sc); @@ -516,7 +516,7 @@ lagg_clone_create(struct if_clone *ifc, int unit, caddr_t params) if_type = IFT_ETHER; } - sc = malloc(sizeof(*sc), M_LAGG, M_WAITOK|M_ZERO); + sc = malloc(sizeof(*sc), M_LAGG, M_WAITOK | M_ZERO); ifp = sc->sc_ifp = if_alloc(if_type); if (ifp == NULL) { free(sc, M_LAGG); @@ -533,7 +533,7 @@ lagg_clone_create(struct if_clone *ifc, int unit, caddr_t params) sc->flowid_shift = V_def_flowid_shift; /* Hash all layers by default */ - sc->sc_flags = MBUF_HASHFLAG_L2|MBUF_HASHFLAG_L3|MBUF_HASHFLAG_L4; + sc->sc_flags = MBUF_HASHFLAG_L2 | MBUF_HASHFLAG_L3 | MBUF_HASHFLAG_L4; lagg_proto_attach(sc, LAGG_PROTO_DEFAULT); @@ -766,7 +766,7 @@ lagg_port_create(struct lagg_softc *sc, struct ifnet *ifp) ifr.ifr_mtu = oldmtu; } - lp = malloc(sizeof(struct lagg_port), M_LAGG, M_WAITOK|M_ZERO); + lp = malloc(sizeof(struct lagg_port), M_LAGG, M_WAITOK | M_ZERO); lp->lp_softc = sc; /* Check if port is a stacked lagg */ @@ -836,7 +836,7 @@ lagg_port_create(struct lagg_softc *sc, struct ifnet *ifp) CK_SLIST_FOREACH(tlp, &sc->sc_ports, lp_entries) { if (tlp->lp_ifp->if_index < ifp->if_index && ( CK_SLIST_NEXT(tlp, lp_entries) == NULL || - ((struct lagg_port*)CK_SLIST_NEXT(tlp, lp_entries))->lp_ifp->if_index > + ((struct lagg_port*)CK_SLIST_NEXT(tlp, lp_entries))->lp_ifp->if_index > ifp->if_index)) break; } @@ -1050,15 +1050,15 @@ fallback: } /* - * Requests counter @cnt data. + * Requests counter @cnt data. * * Counter value is calculated the following way: - * 1) for each port, sum difference between current and "initial" measurements. + * 1) for each port, sum difference between current and "initial" measurements. * 2) add lagg logical interface counters. * 3) add data from detached_counters array. * * We also do the following things on ports attach/detach: - * 1) On port attach we store all counters it has into port_counter array. + * 1) On port attach we store all counters it has into port_counter array. * 2) On port detach we add the different between "initial" and * current counters data to detached_counters array. */ @@ -1432,7 +1432,7 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) /* Invalid combination of options specified. */ error = EINVAL; LAGG_XUNLOCK(sc); - break; /* Return from SIOCSLAGGOPTS. */ + break; /* Return from SIOCSLAGGOPTS. */ } /* @@ -1481,15 +1481,15 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; case LAGG_OPT_LACP_FAST_TIMO: LACP_LOCK(lsc); - LIST_FOREACH(lp, &lsc->lsc_ports, lp_next) - lp->lp_state |= LACP_STATE_TIMEOUT; + LIST_FOREACH(lp, &lsc->lsc_ports, lp_next) + lp->lp_state |= LACP_STATE_TIMEOUT; LACP_UNLOCK(lsc); lsc->lsc_fast_timeout = 1; break; case -LAGG_OPT_LACP_FAST_TIMO: LACP_LOCK(lsc); - LIST_FOREACH(lp, &lsc->lsc_ports, lp_next) - lp->lp_state &= ~LACP_STATE_TIMEOUT; + LIST_FOREACH(lp, &lsc->lsc_ports, lp_next) + lp->lp_state &= ~LACP_STATE_TIMEOUT; LACP_UNLOCK(lsc); lsc->lsc_fast_timeout = 0; break; @@ -1783,8 +1783,7 @@ lagg_setmulti(struct lagg_port *lp) IF_ADDR_WUNLOCK(scifp); return (ENOMEM); } - bcopy(ifma->ifma_addr, &mc->mc_addr, - ifma->ifma_addr->sa_len); + bcopy(ifma->ifma_addr, &mc->mc_addr, ifma->ifma_addr->sa_len); mc->mc_addr.sdl_index = ifp->if_index; mc->mc_ifma = NULL; SLIST_INSERT_HEAD(&lp->lp_mc_head, mc, mc_entries); @@ -2278,7 +2277,7 @@ lagg_fail_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) * If tmp_tp is null, we've received a packet when all * our links are down. Weird, but process it anyways. */ - if ((tmp_tp == NULL || tmp_tp == lp)) { + if (tmp_tp == NULL || tmp_tp == lp) { m->m_pkthdr.rcvif = ifp; return (m); } diff --git a/sys/net/if_lagg.h b/sys/net/if_lagg.h index de0fdd712b3e..dfab0d1b1c7a 100644 --- a/sys/net/if_lagg.h +++ b/sys/net/if_lagg.h @@ -222,7 +222,7 @@ struct lagg_lb { struct lagg_mc { struct sockaddr_dl mc_addr; - struct ifmultiaddr *mc_ifma; + struct ifmultiaddr *mc_ifma; SLIST_ENTRY(lagg_mc) mc_entries; };