diff --git a/SOURCES/openvswitch-2.16.0.patch b/SOURCES/openvswitch-2.16.0.patch index 9a850ae..1cf8b0b 100644 --- a/SOURCES/openvswitch-2.16.0.patch +++ b/SOURCES/openvswitch-2.16.0.patch @@ -23,7 +23,7 @@ index 863f023888..dd0a578508 100755 save_OPTS="${OPTS} $*" diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh -index c55125cf78..fb1bcea7cd 100755 +index c55125cf78..31b9e61e6b 100755 --- a/.ci/linux-prepare.sh +++ b/.ci/linux-prepare.sh @@ -20,10 +20,14 @@ cd sparse @@ -39,8 +39,8 @@ index c55125cf78..fb1bcea7cd 100755 - flake8 hacking sphinx pyOpenSSL wheel setuptools -pip3 install --user --upgrade docutils -pip3 install --user 'meson==0.47.1' -+ flake8 'hacking>=3.0' sphinx setuptools -+pip3 install --user 'meson==0.48.1' ++ flake8 'hacking>=3.0' sphinx pyOpenSSL setuptools ++pip3 install --user 'meson==0.53.2' if [ "$M32" ]; then # Installing 32-bit libraries. @@ -83995,6 +83995,33 @@ index 60dd138914..25aeabfcbe 100644 error = nl_transact(NETLINK_ROUTE, &request, &reply); ofpbuf_uninit(&request); if (error) { +diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c +index b87a50b404..77e3f4b573 100644 +--- a/lib/netdev-offload-dpdk.c ++++ b/lib/netdev-offload-dpdk.c +@@ -834,12 +834,18 @@ vport_to_rte_tunnel(struct netdev *vport, + const struct netdev_tunnel_config *tnl_cfg; + + memset(tunnel, 0, sizeof *tunnel); ++ ++ tnl_cfg = netdev_get_tunnel_config(vport); ++ if (!tnl_cfg) { ++ return -1; ++ } ++ ++ if (!IN6_IS_ADDR_V4MAPPED(&tnl_cfg->ipv6_dst)) { ++ tunnel->is_ipv6 = true; ++ } ++ + if (!strcmp(netdev_get_type(vport), "vxlan")) { + tunnel->type = RTE_FLOW_ITEM_TYPE_VXLAN; +- tnl_cfg = netdev_get_tunnel_config(vport); +- if (!tnl_cfg) { +- return -1; +- } + tunnel->tp_dst = tnl_cfg->dst_port; + if (!VLOG_DROP_DBG(&rl)) { + ds_put_format(s_tnl, "flow tunnel create %d type vxlan; ", diff --git a/lib/netdev-offload-tc.c b/lib/netdev-offload-tc.c index 9845e8d3fe..3bbada7ad6 100644 --- a/lib/netdev-offload-tc.c diff --git a/SPECS/openvswitch2.16.spec b/SPECS/openvswitch2.16.spec index 6636c90..78b30a2 100644 --- a/SPECS/openvswitch2.16.spec +++ b/SPECS/openvswitch2.16.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.16.0 -Release: 105%{?dist} +Release: 106%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -699,6 +699,16 @@ exit 0 %endif %changelog +* Mon Nov 14 2022 Michael Santana - 2.16.0-106 +- Merging 5488747abb netdev-offload-dpdk: Enhance the support of.. [RH git: b98298f07b] + Commit list: + 5488747abb netdev-offload-dpdk: Enhance the support of tunnel pop action + a77c5f584a ci: Update meson requirement for DPDK. + + Resolves conflicts: + .ci/linux-prepare.sh + + * Wed Nov 02 2022 Open vSwitch CI - 2.16.0-105 - Merging upstream branch-2.16 [RH git: f0d9ff1c0c] Commit list: