From nobody Mon Apr 10 04:16:42 2023
X-Original-To: dev-commits-src-all@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 4Pvwf31f7Lz44kSP;
Mon, 10 Apr 2023 04:16:43 +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 4Pvwf309fLz4MTk;
Mon, 10 Apr 2023 04:16:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681100203;
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=As79e0rmf9Zq9kVVoXku92lEuQPVwR+tSGO1S7XGUxA=;
b=legEcUlo+ckvAfo3IbrEzY3494iK8LzpQxKn5rpSXTv2pUQh6pv1LKw6d8YanY6wygkcMt
QJXwgn2WpxfacpuWQ8GBzSfgCYFpCe5DYHevxl07nM2PPN2z+y2lUV9UlYMBcWZfCLICSF
krwAFnbD/e2FvIP5+z+SXtO/UBneUvrWu2KmLw5zK0Dg5EgOGZqLQmo16BK2YYp1MNITEE
AVUKYWK9xEbBHsUjRl9KkzNUTt34oNOMYSKkuM+ZLys+2ZNMHMWR34Fbl6+cCkIoJkTGcw
fnyKl3f2K1mXW9iJ7fRJdXeb1FK+jd4rUIWZpxoNLynYTwLx1LOU3ODLm46m9g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681100203;
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=As79e0rmf9Zq9kVVoXku92lEuQPVwR+tSGO1S7XGUxA=;
b=evzW5tQExxpAqswUEF8+aQw0xEqAYU9QWZ8krL/+GuYT0O96ryqIrA+gHtomXePrE9+AkB
gQ+F7MSbX8HDxX3k7ZCg2LJg6wfATbnI1Bv9Ny9VDuaQ4a9z094rR96wZvD5LJ0yAb5ick
WkEBiv3eHYZAAyJ6jACetJuURqH4Jp4ZTZx18lvChKzGd7jyTpXo8HCBKriPojkL9zhsP4
91MNKXep+iZcfabT8ZwfzbaYh0J8VkYPiywL2p8Bl8d7S14znobahQUHVLkthSAIxIRspw
bnZFBG2jL1ayQgYmFDKv9px3XG0nJNWIFn8IeSVLpgWjCrf7jucKK5kmH7sFfg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681100203; a=rsa-sha256; cv=none;
b=l999WXESk0yasNck7rpiuZ/WXrjiY1QaSsR8eyF88GHXgV56el9PiwgQtMd5GzZqKM5y7L
ZdHC9cvOvGvY4MCTPxSQaPorNl1n7nyBZVi8kNFGcjQddxn/IFENqEC6cjsHD8bL9+Qme6
w0GnsCFZcyrYbyv0pxR9EVfm07aPpz36ZtToYpyjpQ65o+Crf1aQ4Q1JnKOiNL1+xzy+uc
pxlbjJXj2ijNEsbXtLvqhLtz54e4VGfJltr3V6+NSF+g+ayyK8Otd/N3QwVuYAOK9NN7xp
PaNTpRQZ0ZjT6wYOM9UyNw3JyV7XF/YJETLSX6UEya6cdv1HPwUi8FU8gubq7w==
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 4Pvwf261SqzbmF;
Mon, 10 Apr 2023 04:16:42 +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 33A4Gggs039518;
Mon, 10 Apr 2023 04:16:42 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33A4GgWF039517;
Mon, 10 Apr 2023 04:16:42 GMT
(envelope-from git)
Date: Mon, 10 Apr 2023 04:16:42 GMT
Message-Id: <202304100416.33A4GgWF039517@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 9d1d0667c7fd - stable/13 - lagg: Various style fixes
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-all@freebsd.org
X-BeenThere: dev-commits-src-all@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/13
X-Git-Reftype: branch
X-Git-Commit: 9d1d0667c7fd9955711b39abf17750fd2a9d01fd
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=9d1d0667c7fd9955711b39abf17750fd2a9d01fd
commit 9d1d0667c7fd9955711b39abf17750fd2a9d01fd
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2023-03-24 09:55:15 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2023-04-10 04:15:04 +0000
lagg: Various style fixes
MFC after: 1 week
(cherry picked from commit dcd7f0bd02f407952de42d96e1c2c01ee3460702)
---
sys/net/if_lagg.c | 45 ++++++++++++++++++++++-----------------------
sys/net/if_lagg.h | 2 +-
2 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c
index eeae7273ad2a..e559371f2d37 100644
--- a/sys/net/if_lagg.c
+++ b/sys/net/if_lagg.c
@@ -152,15 +152,15 @@ static int lagg_snd_tag_query(struct m_snd_tag *,
union if_snd_tag_query_params *);
static void lagg_snd_tag_free(struct m_snd_tag *);
static struct m_snd_tag *lagg_next_snd_tag(struct m_snd_tag *);
-static void lagg_ratelimit_query(struct ifnet *,
+static void lagg_ratelimit_query(struct ifnet *,
struct if_ratelimit_query_results *);
#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 *);
@@ -168,7 +168,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 *);
@@ -192,7 +192,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 *);
@@ -475,7 +475,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);
@@ -494,7 +494,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);
@@ -532,7 +532,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);
@@ -551,7 +551,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);
@@ -792,7 +792,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 */
@@ -862,7 +862,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;
}
@@ -1076,15 +1076,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.
*/
@@ -1463,7 +1463,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. */
}
/*
@@ -1512,15 +1512,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;
@@ -1909,8 +1909,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);
@@ -2424,7 +2423,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 94f3487af6f7..2ff1ee8279ca 100644
--- a/sys/net/if_lagg.h
+++ b/sys/net/if_lagg.h
@@ -223,7 +223,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;
};