From nobody Fri Mar 31 17:51:54 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 4Pp7CG6kMbz433Gx; Fri, 31 Mar 2023 17:51:54 +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 4Pp7CG6H7rz4XRX; Fri, 31 Mar 2023 17:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680285114; 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=j/pLhSJ/Nqt4DKCwR2kh8aCiqjh1qlQ4T+9FH8/5nfc=; b=tVllWJcP6QWRYqJ7/inBB9lErSomc6xUPfvQ2oXqUCsTNx0CMfPR33eCsVj6Ng5kkHMbAS ZjzFKcPLBrotnM7K8qRgZYOVHpwHf2MAwflDNZsxIWAvNvCYoWkAshPe7CWY6kUNi5nMMV +GOWvjr/41/ZxpN1NGq3hBk1NU5VmfCuVH6Af2SS7xOKi8GW6ezPeSNKBrF+5zsezsGaVq kwHShWV6e1BEKcDgTxBRWP1GwAcSGjwqyYOTm//m6kMynfHlOfAF1uaeK/Y6FYpAH3U9YP O7bzjHbcrghHtt2GJJuwlfCltMk8edSkth5+VUDpwm+aWwWf9HEOTJ9QkARFwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680285114; 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=j/pLhSJ/Nqt4DKCwR2kh8aCiqjh1qlQ4T+9FH8/5nfc=; b=QL+oXGawLwk9VplpeniCQLEGbs2ppl+UHGJ0H/b3QMXARSFdtJpF/+hBcM/ExWPf0QNgCz C7L92ppcHmqGaR/P2ANJ820MNBp2v0tyrXpePUfKYF67+2fNIY5+5Wr5pOpH91CW7k637f fMoaMaMU8CGfe9vRVtym8n62AEcOP98hq1jgzHQSlYxiz7DhUdsYptt3en4eN5LjC6kTMX REX02XGOgPYpPrbrf7zawYrN6rbph3hAtSjFyZeSdMkvoQCajefBzTImUpil4uxkRWb9mn DqUZ6LX20+vHBUGDX0NQkAALkV59B5J6a9GUQ91QxZ7jY0SPhQB4RAsAIfvIWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680285114; a=rsa-sha256; cv=none; b=Ff6rJnUwYCeV6E/JNF26ixejmfGKmEEEjdhLKpLj3fTL1Z8xT62/5zpU7mHTaxIswIigYY OUcIwFcxm4ZCdHxhgpRjIcHF7uvMfAxDrkyzy4jjvLpuTQ1jBjQSZyJWeRhRhenmoF0yl/ a00j1E+rxfdCyOcBECsAXHqmwEj4Soy27eo7ZTukeY9tuVEzaN39MGvfXPYkr0Bc7KSSwJ vwhL3PzqnqoxmabOJi73aDdZUfkBc+zTmC1V1trG4hcATP0sN9CBGYSpX4HtLkP+29SOI/ t+tZW5IjcuP5pFekIZ+xluZfgPTYSVLrJTHBUrMDOmjFIwVfsUcgiYIn2kgsFw== 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 4Pp7CG5LnBz13QG; Fri, 31 Mar 2023 17:51:54 +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 32VHps0d073973; Fri, 31 Mar 2023 17:51:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VHpsGN073972; Fri, 31 Mar 2023 17:51:54 GMT (envelope-from git) Date: Fri, 31 Mar 2023 17:51:54 GMT Message-Id: <202303311751.32VHpsGN073972@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 5a8abd0a298e - main - lacp: Use C99 bool for boolean return value List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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/main X-Git-Reftype: branch X-Git-Commit: 5a8abd0a298e6e7a8bf938a7eb171b647b1860cd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5a8abd0a298e6e7a8bf938a7eb171b647b1860cd commit 5a8abd0a298e6e7a8bf938a7eb171b647b1860cd Author: Zhenlei Huang AuthorDate: 2023-03-31 17:48:36 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-31 17:48:36 +0000 lacp: Use C99 bool for boolean return value This improves readability. No functional change intended. MFC after: 1 week --- sys/net/ieee8023ad_lacp.c | 38 +++++++++++++++++--------------------- sys/net/ieee8023ad_lacp.h | 15 ++++++--------- sys/net/if_lagg.c | 2 +- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index 78345aae68e5..52b4b478bbc7 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -117,9 +117,9 @@ static void lacp_fill_aggregator_id(struct lacp_aggregator *, const struct lacp_port *); static void lacp_fill_aggregator_id_peer(struct lacp_peerinfo *, const struct lacp_peerinfo *); -static int lacp_aggregator_is_compatible(const struct lacp_aggregator *, +static bool lacp_aggregator_is_compatible(const struct lacp_aggregator *, const struct lacp_port *); -static int lacp_peerinfo_is_compatible(const struct lacp_peerinfo *, +static bool lacp_peerinfo_is_compatible(const struct lacp_peerinfo *, const struct lacp_peerinfo *); static struct lacp_aggregator *lacp_aggregator_get(struct lacp_softc *, @@ -1365,44 +1365,40 @@ lacp_fill_aggregator_id_peer(struct lacp_peerinfo *lpi_aggr, * lacp_aggregator_is_compatible: check if a port can join to an aggregator. */ -static int +static bool lacp_aggregator_is_compatible(const struct lacp_aggregator *la, const struct lacp_port *lp) { if (!(lp->lp_state & LACP_STATE_AGGREGATION) || !(lp->lp_partner.lip_state & LACP_STATE_AGGREGATION)) { - return (0); + return (false); } - if (!(la->la_actor.lip_state & LACP_STATE_AGGREGATION)) { - return (0); - } + if (!(la->la_actor.lip_state & LACP_STATE_AGGREGATION)) + return (false); - if (!lacp_peerinfo_is_compatible(&la->la_partner, &lp->lp_partner)) { - return (0); - } + if (!lacp_peerinfo_is_compatible(&la->la_partner, &lp->lp_partner)) + return (false); - if (!lacp_peerinfo_is_compatible(&la->la_actor, &lp->lp_actor)) { - return (0); - } + if (!lacp_peerinfo_is_compatible(&la->la_actor, &lp->lp_actor)) + return (false); - return (1); + return (true); } -static int +static bool lacp_peerinfo_is_compatible(const struct lacp_peerinfo *a, const struct lacp_peerinfo *b) { if (memcmp(&a->lip_systemid, &b->lip_systemid, - sizeof(a->lip_systemid))) { - return (0); + sizeof(a->lip_systemid)) != 0) { + return (false); } - if (memcmp(&a->lip_key, &b->lip_key, sizeof(a->lip_key))) { - return (0); - } + if (memcmp(&a->lip_key, &b->lip_key, sizeof(a->lip_key)) != 0) + return (false); - return (1); + return (true); } static void diff --git a/sys/net/ieee8023ad_lacp.h b/sys/net/ieee8023ad_lacp.h index 0610ed855d50..629bdc25cfc5 100644 --- a/sys/net/ieee8023ad_lacp.h +++ b/sys/net/ieee8023ad_lacp.h @@ -307,7 +307,7 @@ void lacp_linkstate(struct lagg_port *); void lacp_req(struct lagg_softc *, void *); void lacp_portreq(struct lagg_port *, void *); -static __inline int +static __inline bool lacp_isactive(struct lagg_port *lgp) { struct lacp_port *lp = LACP_PORT(lgp); @@ -315,26 +315,23 @@ lacp_isactive(struct lagg_port *lgp) struct lacp_aggregator *la = lp->lp_aggregator; /* This port is joined to the active aggregator */ - if (la != NULL && la == lsc->lsc_active_aggregator) - return (1); - - return (0); + return (la != NULL && la == lsc->lsc_active_aggregator); } -static __inline int +static __inline bool lacp_iscollecting(struct lagg_port *lgp) { struct lacp_port *lp = LACP_PORT(lgp); - return ((lp->lp_state & LACP_STATE_COLLECTING) != 0); + return (lp->lp_state & LACP_STATE_COLLECTING); } -static __inline int +static __inline bool lacp_isdistributing(struct lagg_port *lgp) { struct lacp_port *lp = LACP_PORT(lgp); - return ((lp->lp_state & LACP_STATE_DISTRIBUTING) != 0); + return (lp->lp_state & LACP_STATE_DISTRIBUTING); } /* following constants don't include terminating NUL */ diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 063782b49ad7..cf78b55f4c34 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -2685,7 +2685,7 @@ lagg_lacp_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) * If the port is not collecting or not in the active aggregator then * free and return. */ - if (lacp_iscollecting(lp) == 0 || lacp_isactive(lp) == 0) { + if (!lacp_iscollecting(lp) || !lacp_isactive(lp)) { m_freem(m); return (NULL); }