diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch index 77561c2..f877a68 100644 --- a/SOURCES/openvswitch-3.2.0.patch +++ b/SOURCES/openvswitch-3.2.0.patch @@ -6339,7 +6339,7 @@ index 9224ee2e6d..2e1fcb3a6f 100644 static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); VLOG_WARN_RL(&rl, "xcache LEARN action execution failed."); diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c -index 47ea0f47e7..c7178120aa 100644 +index 47ea0f47e7..a6c1d6dc26 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -1615,7 +1615,8 @@ xlate_lookup_ofproto_(const struct dpif_backer *backer, @@ -6389,6 +6389,19 @@ index 47ea0f47e7..c7178120aa 100644 } err = tnl_route_lookup_flow(ctx, flow, &d_ip6, &s_ip6, &out_dev); +@@ -3802,9 +3814,9 @@ native_tunnel_output(struct xlate_ctx *ctx, const struct xport *xport, + "sending %s request", + buf_dip6, out_dev->xbridge->name, d_ip ? "ARP" : "ND"); + +- err = ovs_router_get_netdev_source_address(&d_ip6, +- out_dev->xbridge->name, +- &nh_s_ip6); ++ err = ovs_router_get_netdev_source_address( ++ &d_ip6, netdev_get_name(out_dev->netdev), &nh_s_ip6); ++ + if (err) { + nh_s_ip6 = s_ip6; + } @@ -5026,10 +5038,37 @@ put_controller_user_action(struct xlate_ctx *ctx, bool dont_send, bool continuation, uint32_t recirc_id, int len, diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec index 193d347..e0fcbe6 100644 --- a/SPECS/openvswitch3.2.spec +++ b/SPECS/openvswitch3.2.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.2.0 -Release: 118%{?dist} +Release: 119%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -763,6 +763,12 @@ exit 0 %endif %changelog +* Wed Feb 26 2025 Open vSwitch CI - 3.2.0-119 +- Merging upstream branch-3.2 [RH git: dde2299284] + Commit list: + 04c8708db6 ofproto-dpif-xlate: Fix source IP lookup for non-bridge ports. + + * Thu Feb 20 2025 Open vSwitch CI - 3.2.0-118 - Merging upstream branch-3.2 [RH git: 39933c35d6] Commit list: