git: d7dd3c8274aa - stable/12 - lacp: Use C99 bool for boolean return value

The branch stable/12 has been updated by zlei:

URL: https://cgit.FreeBSD.org/src/commit/?id=d7dd3c8274aa48e1e29f1232773ef88ff4baf73c

commit d7dd3c8274aa48e1e29f1232773ef88ff4baf73c
Author:     Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2023-03-31 17:48:36 +0000
Commit:     Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2023-04-10 05:06:22 +0000

    lacp: Use C99 bool for boolean return value
    
    This improves readability.
    
    No functional change intended.
    
    MFC after:      1 week
    
    (cherry picked from commit 5a8abd0a298e6e7a8bf938a7eb171b647b1860cd)
    (cherry picked from commit d1d5d8f69659c4d3573e64a62a9306ee944d9e4d)
---
 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 61cd94e5ce2f..2160baf18351 100644
--- a/sys/net/ieee8023ad_lacp.c
+++ b/sys/net/ieee8023ad_lacp.c
@@ -115,9 +115,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 *,
@@ -1337,44 +1337,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 10c6a2c9f892..858500d12b33 100644
--- a/sys/net/ieee8023ad_lacp.h
+++ b/sys/net/ieee8023ad_lacp.h
@@ -300,7 +300,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);
@@ -308,26 +308,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 6a6f08b9696e..b970e1a9f2b1 100644
--- a/sys/net/if_lagg.c
+++ b/sys/net/if_lagg.c
@@ -2441,7 +2441,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);
 	}