From 4bb220c94cc4a2e300bffeae46b51ab790456709 Mon Sep 17 00:00:00 2001 From: Mohammad Heib Date: Mon, 22 Jan 2024 16:14:42 +0200 Subject: [PATCH] ovs: Bump submodule to include igmp protocol version. Specifically the following commit: 077d0bad0436 ("mcast-snooping: Store IGMP/MLD protocol version.") Also fix a small compilation error due to prototype change. Signed-off-by: Mohammad Heib Signed-off-by: Ilya Maximets --- .gitmodules | 2 +- controller/pinctrl.c | 10 ++++++++-- ovs | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index f0d1f8cbe7..841c908405 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "ovs"] path = ovs - url = https://github.com/openvswitch/ovs.git + url = https://github.com/igsilya/ovs.git diff --git a/controller/pinctrl.c b/controller/pinctrl.c index 4992eab089..45d224ded5 100644 --- a/controller/pinctrl.c +++ b/controller/pinctrl.c @@ -62,6 +62,7 @@ #include "vswitch-idl.h" #include "lflow.h" #include "ip-mcast.h" +#include "mcast-snooping.h" VLOG_DEFINE_THIS_MODULE(pinctrl); @@ -5473,11 +5474,16 @@ pinctrl_ip_mcast_handle_igmp(struct rconn *swconn, ovs_rwlock_wrlock(&ip_ms->ms->rwlock); switch (ntohs(ip_flow->tp_src)) { case IGMP_HOST_MEMBERSHIP_REPORT: - case IGMPV2_HOST_MEMBERSHIP_REPORT: + case IGMPV2_HOST_MEMBERSHIP_REPORT: { + enum mcast_group_proto grp_proto = + (ntohs(ip_flow->tp_src) == IGMP_HOST_MEMBERSHIP_REPORT) + ? MCAST_GROUP_IGMPV1 + : MCAST_GROUP_IGMPV2; group_change = mcast_snooping_add_group4(ip_ms->ms, ip4, IP_MCAST_VLAN, - port_key_data); + port_key_data, grp_proto); break; + } case IGMP_HOST_LEAVE_MESSAGE: group_change = mcast_snooping_leave_group4(ip_ms->ms, ip4, IP_MCAST_VLAN, diff --git a/ovs b/ovs index 4102674b3e..fc367a6ed2 160000 --- a/ovs +++ b/ovs @@ -1 +1 @@ -Subproject commit 4102674b3ecadb0e20e512cc661cddbbc4b3d1f6 +Subproject commit fc367a6ed2ffa2ee0a15ec6e836283af655dec9a