Skip to content

Commit

Permalink
ovs: Bump submodule to include igmp protocol version.
Browse files Browse the repository at this point in the history
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]>
Signed-off-by: Ilya Maximets <[email protected]>
  • Loading branch information
mohammadheib authored and igsilya committed Jan 26, 2024
1 parent dd5cd73 commit 4bb220c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "ovs"]
path = ovs
url = https://github.com/openvswitch/ovs.git
url = https://github.com/igsilya/ovs.git
10 changes: 8 additions & 2 deletions controller/pinctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
#include "vswitch-idl.h"
#include "lflow.h"
#include "ip-mcast.h"
#include "mcast-snooping.h"

VLOG_DEFINE_THIS_MODULE(pinctrl);

Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ovs
Submodule ovs updated 113 files

0 comments on commit 4bb220c

Please sign in to comment.