From patchwork Fri Jan 26 17:07:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 1891483 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TM3zs468Kz23f9 for ; Sat, 27 Jan 2024 04:08:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id F235541EF4; Fri, 26 Jan 2024 17:08:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org F235541EF4 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6tqMo2bGklw4; Fri, 26 Jan 2024 17:08:06 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id F2E7841EE6; Fri, 26 Jan 2024 17:08:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org F2E7841EE6 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CAB64C0077; Fri, 26 Jan 2024 17:08:04 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id EF294C0037 for ; Fri, 26 Jan 2024 17:08:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id BDD9F60DF9 for ; Fri, 26 Jan 2024 17:08:03 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org BDD9F60DF9 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z4GSfDAo25PA for ; Fri, 26 Jan 2024 17:08:03 +0000 (UTC) Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::224]) by smtp3.osuosl.org (Postfix) with ESMTPS id AB7E760AFE for ; Fri, 26 Jan 2024 17:08:02 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org AB7E760AFE Received: by mail.gandi.net (Postfix) with ESMTPSA id 8579AE000C; Fri, 26 Jan 2024 17:07:59 +0000 (UTC) From: Ilya Maximets To: ovs-dev@openvswitch.org Date: Fri, 26 Jan 2024 18:07:52 +0100 Message-ID: <20240126170758.114302-1-i.maximets@ovn.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-GND-Sasl: i.maximets@ovn.org Cc: Ilya Maximets , Dumitru Ceara Subject: [ovs-dev] [PATCH] mcast-snooping: Remove typedef from mcast_group_proto. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Typedefs are confusing and the coding style generally advises to not use them. Removing typedef until others start using it. This typedef already got me while testing an OVN update to use OVS 3.3 as a submodule, since the variable was declared in a switch statement and it wasn't clearly visible that there is a variable definition in one of the cases and braces should be used. Strangely some versions of compilers do not require braces in this case, so OVN change works locally, but not in CI. Fixes: 077d0bad0436 ("mcast-snooping: Store IGMP/MLD protocol version.") Signed-off-by: Ilya Maximets Acked-by: Mohammad Heib --- lib/mcast-snooping.c | 6 +++--- lib/mcast-snooping.h | 12 ++++++------ ofproto/ofproto-dpif-xlate.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/mcast-snooping.c b/lib/mcast-snooping.c index 60ef8381e..dc5164b41 100644 --- a/lib/mcast-snooping.c +++ b/lib/mcast-snooping.c @@ -58,7 +58,7 @@ mcast_snooping_flood_unreg(const struct mcast_snooping *ms) } char * -mcast_snooping_group_protocol_str(mcast_group_proto grp_proto) +mcast_snooping_group_protocol_str(enum mcast_group_proto grp_proto) { switch (grp_proto) { case MCAST_GROUP_IGMPV1: @@ -414,7 +414,7 @@ bool mcast_snooping_add_group(struct mcast_snooping *ms, const struct in6_addr *addr, uint16_t vlan, void *port, - mcast_group_proto grp_proto) + enum mcast_group_proto grp_proto) OVS_REQ_WRLOCK(ms->rwlock) { bool learned; @@ -460,7 +460,7 @@ mcast_snooping_add_group(struct mcast_snooping *ms, bool mcast_snooping_add_group4(struct mcast_snooping *ms, ovs_be32 ip4, uint16_t vlan, void *port, - mcast_group_proto grp_proto) + enum mcast_group_proto grp_proto) OVS_REQ_WRLOCK(ms->rwlock) { struct in6_addr addr = in6_addr_mapped_ipv4(ip4); diff --git a/lib/mcast-snooping.h b/lib/mcast-snooping.h index 76ab4e4f7..de42cf826 100644 --- a/lib/mcast-snooping.h +++ b/lib/mcast-snooping.h @@ -40,13 +40,13 @@ struct mcast_snooping; #define MCAST_MROUTER_PORT_IDLE_TIME 180 /* Multicast group protocol. */ -typedef enum { +enum mcast_group_proto { MCAST_GROUP_IGMPV1 = 0, MCAST_GROUP_IGMPV2, MCAST_GROUP_IGMPV3, MCAST_GROUP_MLDV1, MCAST_GROUP_MLDV2, -} mcast_group_proto; +}; /* Multicast group entry. * Guarded by owning 'mcast_snooping''s rwlock. */ @@ -61,7 +61,7 @@ struct mcast_group { uint16_t vlan; /* Multicast group IPv6/IPv4 Protocol version IGMPv1,2,3 or MLDv1,2 */ - mcast_group_proto protocol_version; + enum mcast_group_proto protocol_version; /* Node in parent struct mcast_snooping group_lru. */ struct ovs_list group_node OVS_GUARDED; @@ -198,11 +198,11 @@ mcast_snooping_lookup4(const struct mcast_snooping *ms, ovs_be32 ip4, bool mcast_snooping_add_group(struct mcast_snooping *ms, const struct in6_addr *addr, uint16_t vlan, void *port, - mcast_group_proto grp_proto) + enum mcast_group_proto grp_proto) OVS_REQ_WRLOCK(ms->rwlock); bool mcast_snooping_add_group4(struct mcast_snooping *ms, ovs_be32 ip4, uint16_t vlan, void *port, - mcast_group_proto grp_proto) + enum mcast_group_proto grp_proto) OVS_REQ_WRLOCK(ms->rwlock); int mcast_snooping_add_report(struct mcast_snooping *ms, const struct dp_packet *p, @@ -224,7 +224,7 @@ bool mcast_snooping_add_mrouter(struct mcast_snooping *ms, uint16_t vlan, OVS_REQ_WRLOCK(ms->rwlock); bool mcast_snooping_is_query(ovs_be16 igmp_type); bool mcast_snooping_is_membership(ovs_be16 igmp_type); -char *mcast_snooping_group_protocol_str(mcast_group_proto grp_proto); +char *mcast_snooping_group_protocol_str(enum mcast_group_proto grp_proto); /* Flush. */ void mcast_snooping_mdb_flush(struct mcast_snooping *ms); diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index f4d1d7194..1cf4d5f7c 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -2796,7 +2796,7 @@ update_mcast_snooping_table4__(const struct xlate_ctx *ctx, OVS_REQ_WRLOCK(ms->rwlock) { const struct igmp_header *igmp; - mcast_group_proto grp_proto; + enum mcast_group_proto grp_proto; int count; size_t offset; ovs_be32 ip4 = flow->igmp_group_ip4;