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 <[email protected]>
---
controller/pinctrl.c | 6 +++++-
ovs | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/controller/pinctrl.c b/controller/pinctrl.c
index 4992eab08..77bf67e58 100644
--- a/controller/pinctrl.c
+++ b/controller/pinctrl.c
@@ -5474,9 +5474,13 @@ pinctrl_ip_mcast_handle_igmp(struct rconn *swconn,
switch (ntohs(ip_flow->tp_src)) {
case IGMP_HOST_MEMBERSHIP_REPORT:
case IGMPV2_HOST_MEMBERSHIP_REPORT:
+ 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 =
diff --git a/ovs b/ovs
index 4102674b3..b222593bc 160000
--- a/ovs
+++ b/ovs
@@ -1 +1 @@
-Subproject commit 4102674b3ecadb0e20e512cc661cddbbc4b3d1f6
+Subproject commit b222593bc69b5d82849d18eb435564f5f93449d3
--
2.34.3
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
