diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch
index e4ba596..a2da0d2 100644
--- a/SOURCES/openvswitch-3.2.0.patch
+++ b/SOURCES/openvswitch-3.2.0.patch
@@ -11103,7 +11103,7 @@ index 871a3bda4f..3d84a53182 100644
  ])
  
 diff --git a/tests/system-traffic.at b/tests/system-traffic.at
-index 808c492a22..07806d03d6 100644
+index 808c492a22..05ce50c6f1 100644
 --- a/tests/system-traffic.at
 +++ b/tests/system-traffic.at
 @@ -10,13 +10,13 @@ ADD_NAMESPACES(at_ns0, at_ns1)
@@ -11234,11 +11234,15 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -253,13 +253,13 @@ priority=0,actions=NORMAL
+@@ -253,13 +253,17 @@ priority=0,actions=NORMAL
  AT_CHECK([ovs-ofctl del-flows br0])
  AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
  
 -NS_CHECK_EXEC([at_ns0], [ping6 -q -c 3 -i 0.3 -w 2 fc00::3 | FORMAT_PING], [0], [dnl
++dnl We need to wait until the new flows are actually in the datapath to avoid
++dnl intermittent loss of first ping packet.
++AT_CHECK([ovs-appctl revalidator/wait])
++
 +NS_CHECK_EXEC([at_ns0], [ping6 -q -c 3 -i 0.3 -W 2 fc00::3 | FORMAT_PING], [0], [dnl
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
@@ -11251,7 +11255,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -278,13 +278,13 @@ ADD_VETH_BOND(p1 p2, at_ns1, br0, bond0, lacp=active bond_mode=balance-tcp, "10.
+@@ -278,13 +282,13 @@ ADD_VETH_BOND(p1 p2, at_ns1, br0, bond0, lacp=active bond_mode=balance-tcp, "10.
  
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.1.1.2])
  
@@ -11268,7 +11272,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -315,18 +315,18 @@ ADD_NATIVE_TUNNEL([vxlan], [at_vxlan1], [at_ns0], [172.31.1.100], [10.1.1.1/24],
+@@ -315,18 +319,18 @@ ADD_NATIVE_TUNNEL([vxlan], [at_vxlan1], [at_ns0], [172.31.1.100], [10.1.1.1/24],
                    [id 0 dstport 4789])
  
  dnl First, check the underlay
@@ -11291,7 +11295,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -363,17 +363,17 @@ ADD_VLAN(at_vxlan1, at_ns0, 100, "10.1.1.1/24")
+@@ -363,17 +367,17 @@ ADD_VLAN(at_vxlan1, at_ns0, 100, "10.1.1.1/24")
  ADD_VLAN(p0, at_ns0, 42, "172.31.1.1/24")
  
  dnl First, check the underlay
@@ -11313,7 +11317,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -406,18 +406,18 @@ ADD_NATIVE_TUNNEL6([vxlan], [at_vxlan1], [at_ns0], [fc00::100], [10.1.1.1/24],
+@@ -406,18 +410,18 @@ ADD_NATIVE_TUNNEL6([vxlan], [at_vxlan1], [at_ns0], [fc00::100], [10.1.1.1/24],
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::100])
  
  dnl First, check the underlay
@@ -11336,7 +11340,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -448,18 +448,18 @@ ADD_OVS_TUNNEL([gre], [br0], [at_gre0], [172.31.1.1], [10.1.1.100/24])
+@@ -448,18 +452,18 @@ ADD_OVS_TUNNEL([gre], [br0], [at_gre0], [172.31.1.1], [10.1.1.100/24])
  ADD_NATIVE_TUNNEL([gretap], [ns_gre0], [at_ns0], [172.31.1.100], [10.1.1.1/24])
  
  dnl First, check the underlay
@@ -11359,7 +11363,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -495,12 +495,12 @@ ADD_NATIVE_TUNNEL6([ip6gretap], [ns_gretap0], [at_ns0], [fc00:100::100],
+@@ -495,12 +499,12 @@ ADD_NATIVE_TUNNEL6([ip6gretap], [ns_gretap0], [at_ns0], [fc00:100::100],
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 2 fc00:100::100])
  
  dnl First, check the underlay
@@ -11374,7 +11378,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  OVS_TRAFFIC_VSWITCHD_STOP
-@@ -532,12 +532,12 @@ ADD_OVS_TUNNEL([erspan], [br0], [at_erspan0], [172.31.1.1], [10.1.1.100/24], [op
+@@ -532,12 +536,12 @@ ADD_OVS_TUNNEL([erspan], [br0], [at_erspan0], [172.31.1.1], [10.1.1.100/24], [op
  ADD_NATIVE_TUNNEL([erspan], [ns_erspan0], [at_ns0], [172.31.1.100], [10.1.1.1/24], [seq key 1 erspan_ver 1 erspan 7])
  
  dnl First, check the underlay
@@ -11389,7 +11393,7 @@ index 808c492a22..07806d03d6 100644
  NS_CHECK_EXEC([at_ns0], [ping -s 1200 -i 0.3 -c 3 10.1.1.100 | FORMAT_PING], [0], [dnl
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
-@@ -569,12 +569,12 @@ ADD_OVS_TUNNEL([erspan], [br0], [at_erspan0], [172.31.1.1], [10.1.1.100/24], [op
+@@ -569,12 +573,12 @@ ADD_OVS_TUNNEL([erspan], [br0], [at_erspan0], [172.31.1.1], [10.1.1.100/24], [op
  ADD_NATIVE_TUNNEL([erspan], [ns_erspan0], [at_ns0], [172.31.1.100], [10.1.1.1/24], [seq key 1 erspan_ver 2 erspan_dir egress erspan_hwid 7])
  
  dnl First, check the underlay
@@ -11404,7 +11408,7 @@ index 808c492a22..07806d03d6 100644
  NS_CHECK_EXEC([at_ns0], [ping -s 1200 -i 0.3 -c 3 10.1.1.100 | FORMAT_PING], [0], [dnl
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
-@@ -610,12 +610,12 @@ ADD_NATIVE_TUNNEL6([ip6erspan], [ns_erspan0], [at_ns0], [fc00:100::100],
+@@ -610,12 +614,12 @@ ADD_NATIVE_TUNNEL6([ip6erspan], [ns_erspan0], [at_ns0], [fc00:100::100],
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 2 fc00:100::100])
  
  dnl First, check the underlay
@@ -11419,7 +11423,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  OVS_TRAFFIC_VSWITCHD_STOP
-@@ -651,12 +651,12 @@ ADD_NATIVE_TUNNEL6([ip6erspan], [ns_erspan0], [at_ns0], [fc00:100::100],
+@@ -651,12 +655,12 @@ ADD_NATIVE_TUNNEL6([ip6erspan], [ns_erspan0], [at_ns0], [fc00:100::100],
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 2 fc00:100::100])
  
  dnl First, check the underlay
@@ -11434,7 +11438,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  OVS_TRAFFIC_VSWITCHD_STOP
-@@ -686,18 +686,18 @@ ADD_NATIVE_TUNNEL([geneve], [ns_gnv0], [at_ns0], [172.31.1.100], [10.1.1.1/24],
+@@ -686,18 +690,18 @@ ADD_NATIVE_TUNNEL([geneve], [ns_gnv0], [at_ns0], [172.31.1.100], [10.1.1.1/24],
                    [vni 0])
  
  dnl First, check the underlay
@@ -11457,7 +11461,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -739,12 +739,12 @@ ADD_NATIVE_TUNNEL([geneve], [ns_gnv0], [at_ns0], [172.31.1.100], [10.1.1.1/24],
+@@ -739,12 +743,12 @@ ADD_NATIVE_TUNNEL([geneve], [ns_gnv0], [at_ns0], [172.31.1.100], [10.1.1.1/24],
                    [vni 0])
  
  dnl First, check the underlay
@@ -11472,7 +11476,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -837,18 +837,18 @@ ADD_NATIVE_TUNNEL6([geneve], [ns_gnv0], [at_ns0], [fc00::100], [10.1.1.1/24],
+@@ -837,18 +841,18 @@ ADD_NATIVE_TUNNEL6([geneve], [ns_gnv0], [at_ns0], [fc00::100], [10.1.1.1/24],
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::100])
  
  dnl First, check the underlay
@@ -11495,7 +11499,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -883,12 +883,12 @@ AT_CHECK([ovs-ofctl add-flow br0 "table=37,actions=at_gnv0"])
+@@ -883,12 +887,12 @@ AT_CHECK([ovs-ofctl add-flow br0 "table=37,actions=at_gnv0"])
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::100])
  
  dnl First, check the underlay.
@@ -11510,7 +11514,7 @@ index 808c492a22..07806d03d6 100644
  sleep 1
  
  dnl Generate a single packet trough the controler that needs an ARP modification
-@@ -903,6 +903,116 @@ ovs-pcap p0.pcap
+@@ -903,6 +907,116 @@ ovs-pcap p0.pcap
  AT_CHECK([ovs-pcap p0.pcap | grep -Eq "^[[[:xdigit:]]]{24}86dd60000000003a1140fc000000000000000000000000000100fc000000000000000000000000000001[[[:xdigit:]]]{4}17c1003a[[[:xdigit:]]]{4}0000655800000000fffffffffffffa163e949d8008060001080006040001[[[:xdigit:]]]{12}0a0000f40000000000000a0000fe$"])
  AT_CLEANUP
  
@@ -11627,7 +11631,7 @@ index 808c492a22..07806d03d6 100644
  AT_SETUP([datapath - ping over gre tunnel by simulated packets])
  OVS_CHECK_TUNNEL_TSO()
  OVS_CHECK_MIN_KERNEL(3, 10)
-@@ -930,7 +1040,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -i p0 dst host 172.31.1.1 -l > p0.pcap 2>/
+@@ -930,7 +1044,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -i p0 dst host 172.31.1.1 -l > p0.pcap 2>/
  sleep 1
  
  dnl First, check the underlay.
@@ -11636,7 +11640,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -978,7 +1088,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -x -i p0 dst host 172.31.1.1 -l > p0.pcap
+@@ -978,7 +1092,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -x -i p0 dst host 172.31.1.1 -l > p0.pcap
  sleep 1
  
  dnl First, check the underlay
@@ -11645,7 +11649,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -1031,7 +1141,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -x -i p0 dst host 172.31.1.1 -l > p0.pcap
+@@ -1031,7 +1145,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -x -i p0 dst host 172.31.1.1 -l > p0.pcap
  sleep 1
  
  dnl First, check the underlay.
@@ -11654,7 +11658,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -1088,7 +1198,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -x -i p0 dst host fc00:100::1 -l > p0.pcap
+@@ -1088,7 +1202,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -x -i p0 dst host fc00:100::1 -l > p0.pcap
  sleep 1
  
  dnl First, check the underlay.
@@ -11663,7 +11667,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -1144,7 +1254,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -x -i p0 dst host fc00:100::1 -l > p0.pcap
+@@ -1144,7 +1258,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -x -i p0 dst host fc00:100::1 -l > p0.pcap
  sleep 1
  
  dnl First, check the underlay.
@@ -11672,7 +11676,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -1214,12 +1324,12 @@ dnl "connect: Cannot assign requested address"
+@@ -1214,12 +1328,12 @@ dnl "connect: Cannot assign requested address"
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::100])
  
  dnl First, check the underlay.
@@ -11687,7 +11691,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -1276,12 +1386,12 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::100])
+@@ -1276,12 +1390,12 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::100])
  OVS_WAIT_UNTIL([ip netns exec at_ns1 ping6 -c 1 fc00:100::100])
  
  dnl First, check the underlay.
@@ -11702,7 +11706,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -1307,7 +1417,7 @@ priority=10 in_port=2,ip,actions=clone(mod_dl_src(ae:c6:7e:54:8d:4d),mod_dl_dst(
+@@ -1307,7 +1421,7 @@ priority=10 in_port=2,ip,actions=clone(mod_dl_src(ae:c6:7e:54:8d:4d),mod_dl_dst(
  AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
  
  AT_CHECK([ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log])
@@ -11711,7 +11715,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -1348,11 +1458,11 @@ table=1,priority=10 actions=normal
+@@ -1348,11 +1462,11 @@ table=1,priority=10 actions=normal
  AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
  AT_CHECK([ovs-ofctl add-flows br1 flows.txt])
  
@@ -11725,7 +11729,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -1387,11 +1497,11 @@ table=3,priority=10 actions=normal
+@@ -1387,11 +1501,11 @@ table=3,priority=10 actions=normal
  AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
  AT_CHECK([ovs-ofctl add-flows br1 flows.txt])
  
@@ -11739,7 +11743,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  OVS_TRAFFIC_VSWITCHD_STOP
-@@ -2062,7 +2172,7 @@ add in_port=ovs-p1,actions=ovs-p0,br0
+@@ -2062,7 +2176,7 @@ add in_port=ovs-p1,actions=ovs-p0,br0
  ])
  AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
  
@@ -11748,7 +11752,7 @@ index 808c492a22..07806d03d6 100644
  10 packets transmitted, 10 received, 0% packet loss, time 0ms
  ])
  
-@@ -2081,7 +2191,7 @@ modify in_port=ovs-p1,actions=ovs-p0
+@@ -2081,7 +2195,7 @@ modify in_port=ovs-p1,actions=ovs-p0
  AT_CHECK([ovs-ofctl add-flows br0 flows2.txt])
  AT_CHECK([ovs-appctl revalidator/wait], [0])
  
@@ -11757,7 +11761,7 @@ index 808c492a22..07806d03d6 100644
  10 packets transmitted, 10 received, 0% packet loss, time 0ms
  ])
  
-@@ -2096,7 +2206,7 @@ recirc_id(<recirc>),in_port(3),eth_type(0x0800),ipv4(frag=no), packets:19, bytes
+@@ -2096,7 +2210,7 @@ recirc_id(<recirc>),in_port(3),eth_type(0x0800),ipv4(frag=no), packets:19, bytes
  AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
  AT_CHECK([ovs-appctl revalidator/wait], [0])
  
@@ -11766,7 +11770,7 @@ index 808c492a22..07806d03d6 100644
  10 packets transmitted, 10 received, 0% packet loss, time 0ms
  ])
  
-@@ -2111,6 +2221,72 @@ recirc_id(<recirc>),in_port(3),eth_type(0x0800),ipv4(frag=no), packets:29, bytes
+@@ -2111,6 +2225,72 @@ recirc_id(<recirc>),in_port(3),eth_type(0x0800),ipv4(frag=no), packets:29, bytes
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
  
@@ -11839,7 +11843,7 @@ index 808c492a22..07806d03d6 100644
  AT_BANNER([MPLS])
  
  AT_SETUP([mpls - encap header dp-support])
-@@ -2128,20 +2304,29 @@ dnl The flow will encap a mpls header to the ip packet
+@@ -2128,20 +2308,29 @@ dnl The flow will encap a mpls header to the ip packet
  dnl eth/ip/icmp --> OVS --> eth/mpls/eth/ip/icmp
  AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x0800 actions=encap(mpls),set_mpls_label:2,encap(ethernet),set_field:00:00:00:00:00:02->dl_dst,set_field:00:00:00:00:00:01->dl_src,ovs-p1"])
  
@@ -11880,7 +11884,7 @@ index 808c492a22..07806d03d6 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -2160,20 +2345,29 @@ dnl The flow will encap a mpls header to the ip packet
+@@ -2160,20 +2349,29 @@ dnl The flow will encap a mpls header to the ip packet
  dnl eth/ip/icmp --> OVS --> eth/mpls/eth/ip/icmp
  AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x0800 actions=encap(mpls),set_mpls_label:2,encap(ethernet),set_field:00:00:00:00:00:02->dl_dst,set_field:00:00:00:00:00:01->dl_src,ovs-p1"])
  
@@ -11921,7 +11925,7 @@ index 808c492a22..07806d03d6 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -2193,20 +2387,29 @@ dnl The flow will encap a mpls header to the ip packet
+@@ -2193,20 +2391,29 @@ dnl The flow will encap a mpls header to the ip packet
  dnl eth/ip/icmp --> OVS --> eth/mpls/eth/ip/icmp
  AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x0800 actions=encap(mpls_mc),set_mpls_label:2,encap(ethernet),set_field:00:00:00:00:00:02->dl_dst,set_field:00:00:00:00:00:01->dl_src,ovs-p1"])
  
@@ -11962,7 +11966,7 @@ index 808c492a22..07806d03d6 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -2225,20 +2428,29 @@ dnl The flow will encap a mpls header to the ip packet
+@@ -2225,20 +2432,29 @@ dnl The flow will encap a mpls header to the ip packet
  dnl eth/ip/icmp --> OVS --> eth/mpls/eth/ip/icmp
  AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x0800 actions=encap(mpls_mc),set_mpls_label:2,encap(ethernet),set_field:00:00:00:00:00:02->dl_dst,set_field:00:00:00:00:00:01->dl_src,ovs-p1"])
  
@@ -12003,7 +12007,7 @@ index 808c492a22..07806d03d6 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -2259,24 +2471,30 @@ dnl eth/mpls/eth/ip/icmp --> OVS --> eth/ip/icmp
+@@ -2259,24 +2475,30 @@ dnl eth/mpls/eth/ip/icmp --> OVS --> eth/ip/icmp
  
  AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x8847,mpls_label=2 actions=decap(),decap(packet_type(ns=0,type=0)),ovs-p1"])
  
@@ -12049,7 +12053,7 @@ index 808c492a22..07806d03d6 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -2296,24 +2514,30 @@ dnl eth/mpls/eth/ip/icmp --> OVS --> eth/ip/icmp
+@@ -2296,24 +2518,30 @@ dnl eth/mpls/eth/ip/icmp --> OVS --> eth/ip/icmp
  
  AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x8847,mpls_label=2 actions=decap(),decap(packet_type(ns=0,type=0)),ovs-p1"])
  
@@ -12095,7 +12099,7 @@ index 808c492a22..07806d03d6 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -2322,34 +2546,53 @@ AT_BANNER([QoS])
+@@ -2322,34 +2550,53 @@ AT_BANNER([QoS])
  
  AT_SETUP([QoS - basic configuration])
  AT_SKIP_IF([test $HAVE_TC = no])
@@ -12166,7 +12170,7 @@ index 808c492a22..07806d03d6 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -2516,6 +2759,7 @@ AT_CLEANUP
+@@ -2516,6 +2763,7 @@ AT_CLEANUP
  
  AT_SETUP([conntrack - ct flush])
  CHECK_CONNTRACK()
@@ -12174,7 +12178,7 @@ index 808c492a22..07806d03d6 100644
  OVS_TRAFFIC_VSWITCHD_START()
  
  ADD_NAMESPACES(at_ns0, at_ns1)
-@@ -2526,10 +2770,8 @@ ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
+@@ -2526,10 +2774,8 @@ ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
  AT_DATA([flows.txt], [dnl
  priority=1,action=drop
  priority=10,arp,action=normal
@@ -12187,7 +12191,7 @@ index 808c492a22..07806d03d6 100644
  ])
  
  AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
-@@ -2564,7 +2806,7 @@ AT_CHECK([FLUSH_CMD zone=5 'ct_nw_src=10.1.1.1,ct_nw_dst=10.1.1.2,ct_nw_proto=17
+@@ -2564,7 +2810,7 @@ AT_CHECK([FLUSH_CMD zone=5 'ct_nw_src=10.1.1.1,ct_nw_dst=10.1.1.2,ct_nw_proto=17
  AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0])
  
  dnl Test ICMP traffic
@@ -12196,7 +12200,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -2692,6 +2934,25 @@ udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.
+@@ -2692,6 +2938,25 @@ udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.
  
  AT_CHECK([FLUSH_CMD])
  
@@ -12222,7 +12226,7 @@ index 808c492a22..07806d03d6 100644
  AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [1])
  ])
  
-@@ -2745,7 +3006,7 @@ priority=100,in_port=2,icmp,ct_state=+trk+est,action=1
+@@ -2745,7 +3010,7 @@ priority=100,in_port=2,icmp,ct_state=+trk+est,action=1
  AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
  
  dnl Pings from ns0->ns1 should work fine.
@@ -12231,7 +12235,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -2753,7 +3014,10 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+@@ -2753,7 +3018,10 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
  icmp,orig=(src=10.1.1.1,dst=10.1.1.2,id=<cleared>,type=8,code=0),reply=(src=10.1.1.2,dst=10.1.1.1,id=<cleared>,type=0,code=0)
  ])
  
@@ -12243,7 +12247,7 @@ index 808c492a22..07806d03d6 100644
  
  dnl Pings from ns1->ns0 should fail.
  NS_CHECK_EXEC([at_ns1], [ping -q -c 3 -i 0.3 -w 2 10.1.1.1 | FORMAT_PING], [0], [dnl
-@@ -2786,7 +3050,7 @@ priority=100,in_port=2,icmp,ct_state=+trk+est,action=1
+@@ -2786,7 +3054,7 @@ priority=100,in_port=2,icmp,ct_state=+trk+est,action=1
  AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
  
  dnl Pings from ns0->ns1 should work fine.
@@ -12252,7 +12256,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -2886,7 +3150,7 @@ NS_CHECK_EXEC([at_ns1], [ping6 -q -c 3 -i 0.3 -w 2 fc00::1 | FORMAT_PING], [0],
+@@ -2886,7 +3154,7 @@ NS_CHECK_EXEC([at_ns1], [ping6 -q -c 3 -i 0.3 -w 2 fc00::1 | FORMAT_PING], [0],
  ])
  
  dnl Pings from ns0->ns1 should work fine.
@@ -12261,7 +12265,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -2894,6 +3158,11 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fc00::2)], [0], [dnl
+@@ -2894,6 +3162,11 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fc00::2)], [0], [dnl
  icmpv6,orig=(src=fc00::1,dst=fc00::2,id=<cleared>,type=128,code=0),reply=(src=fc00::2,dst=fc00::1,id=<cleared>,type=129,code=0)
  ])
  
@@ -12273,7 +12277,7 @@ index 808c492a22..07806d03d6 100644
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
  
-@@ -3796,7 +4065,7 @@ table=0,in_port=ovs-p1,ct_state=+trk+rel+rpl,icmp,actions=ovs-p0
+@@ -3796,7 +4069,7 @@ table=0,in_port=ovs-p1,ct_state=+trk+rel+rpl,icmp,actions=ovs-p0
  AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
  
  rm p0.pcap
@@ -12282,7 +12286,7 @@ index 808c492a22..07806d03d6 100644
  OVS_WAIT_UNTIL([grep "listening" tcpdump0_err])
  
  dnl Send UDP packet from 10.1.1.1:1234 to 10.1.1.240:80
-@@ -3837,12 +4106,12 @@ dnl Modify userspace conntrack fragmentation handling.
+@@ -3837,12 +4110,12 @@ dnl Modify userspace conntrack fragmentation handling.
  DPCTL_MODIFY_FRAGMENTATION()
  
  dnl Ipv4 fragmentation connectivity check.
@@ -12297,7 +12301,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -3914,12 +4183,12 @@ dnl Modify userspace conntrack fragmentation handling.
+@@ -3914,12 +4187,12 @@ dnl Modify userspace conntrack fragmentation handling.
  DPCTL_MODIFY_FRAGMENTATION()
  
  dnl Ipv4 fragmentation connectivity check.
@@ -12312,7 +12316,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -3960,22 +4229,22 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+@@ -3960,22 +4233,22 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.2.2.2])
  
  dnl Ipv4 fragmentation connectivity check.
@@ -12339,7 +12343,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -4134,12 +4403,12 @@ dnl "connect: Cannot assign requested address"
+@@ -4134,12 +4407,12 @@ dnl "connect: Cannot assign requested address"
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2])
  
  dnl Ipv6 fragmentation connectivity check.
@@ -12354,7 +12358,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -4216,12 +4485,12 @@ dnl "connect: Cannot assign requested address"
+@@ -4216,12 +4489,12 @@ dnl "connect: Cannot assign requested address"
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2])
  
  dnl Ipv4 fragmentation connectivity check.
@@ -12369,7 +12373,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -4259,22 +4528,22 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+@@ -4259,22 +4532,22 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00:1::4])
  
  dnl Ipv6 fragmentation connectivity check.
@@ -12396,7 +12400,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -4486,18 +4755,18 @@ ADD_NATIVE_TUNNEL([vxlan], [at_vxlan1], [at_ns0], [172.31.1.100], [10.1.1.1/24],
+@@ -4486,18 +4759,18 @@ ADD_NATIVE_TUNNEL([vxlan], [at_vxlan1], [at_ns0], [172.31.1.100], [10.1.1.1/24],
                    [id 0 dstport 4789])
  
  dnl First, check the underlay
@@ -12419,7 +12423,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -4546,18 +4815,18 @@ dnl "connect: Cannot assign requested address"
+@@ -4546,18 +4819,18 @@ dnl "connect: Cannot assign requested address"
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2])
  
  dnl First, check the underlay
@@ -12442,7 +12446,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -4670,7 +4939,7 @@ dnl The default udp_single and icmp_first timeouts are 30 seconds in
+@@ -4670,7 +4943,7 @@ dnl The default udp_single and icmp_first timeouts are 30 seconds in
  dnl kernel DP, and 60 seconds in userspace DP.
  
  dnl Send ICMP and UDP traffic
@@ -12451,7 +12455,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000200080000 actions=resubmit(,0)"])
-@@ -4696,7 +4965,7 @@ done
+@@ -4696,7 +4969,7 @@ done
  AT_CHECK([ovs-vsctl --may-exist add-zone-tp $DP_TYPE zone=5 udp_first=1 udp_single=1 icmp_first=1 icmp_reply=1])
  
  dnl Send ICMP and UDP traffic
@@ -12460,7 +12464,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000200080000 actions=resubmit(,0)"])
-@@ -4714,7 +4983,7 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+@@ -4714,7 +4987,7 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
  ])
  
  dnl Re-send ICMP and UDP traffic to test conntrack cache
@@ -12469,7 +12473,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000200080000 actions=resubmit(,0)"])
-@@ -4735,7 +5004,7 @@ dnl Set the timeout policy to default again.
+@@ -4735,7 +5008,7 @@ dnl Set the timeout policy to default again.
  AT_CHECK([ovs-vsctl del-zone-tp $DP_TYPE zone=5])
  
  dnl Send ICMP and UDP traffic
@@ -12478,7 +12482,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000200080000 actions=resubmit(,0)"])
-@@ -5001,7 +5270,7 @@ table=2,in_port=1,ip,ct_state=+trk+est,ct_zone=2,action=LOCAL
+@@ -5001,7 +5274,7 @@ table=2,in_port=1,ip,ct_state=+trk+est,ct_zone=2,action=LOCAL
  
  AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
  
@@ -12487,7 +12491,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -5072,7 +5341,7 @@ table=4,priority=100,ip,action=output:NXM_NX_REG0[[]]
+@@ -5072,7 +5345,7 @@ table=4,priority=100,ip,action=output:NXM_NX_REG0[[]]
  
  AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
  
@@ -12496,7 +12500,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -5811,11 +6080,11 @@ ADD_NAMESPACES(at_ns0, at_ns1)
+@@ -5811,11 +6084,11 @@ ADD_NAMESPACES(at_ns0, at_ns1)
  ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24")
  NS_CHECK_EXEC([at_ns0], [ip link set dev p0 address 80:88:88:88:88:88])
  ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
@@ -12510,7 +12514,7 @@ index 808c492a22..07806d03d6 100644
  in_port=2,ct_state=-trk,tcp,tp_dst=34568,action=ct(table=0,zone=1,nat)
  in_port=2,ct_state=+trk,ct_zone=1,tcp,action=1
  dnl
-@@ -5839,17 +6108,29 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+@@ -5839,17 +6112,29 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
  
  dnl HTTP requests from p0->p1 should work fine.
  OVS_START_L7([at_ns1], [http])
@@ -12544,7 +12548,7 @@ index 808c492a22..07806d03d6 100644
  AT_CLEANUP
  
  AT_SETUP([conntrack - more complex SNAT])
-@@ -6140,7 +6421,7 @@ table=10 priority=0 action=drop
+@@ -6140,7 +6425,7 @@ table=10 priority=0 action=drop
  AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
  
  rm p0.pcap
@@ -12553,7 +12557,7 @@ index 808c492a22..07806d03d6 100644
  sleep 1
  
  dnl UDP packets from ns0->ns1 should solicit "destination unreachable" response.
-@@ -6164,7 +6445,7 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=
+@@ -6164,7 +6449,7 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=
  udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=<cleared>,dport=<cleared>),mark=1
  ])
  
@@ -12562,7 +12566,7 @@ index 808c492a22..07806d03d6 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -6854,7 +7135,7 @@ dnl waiting, we get occasional failures due to the following error:
+@@ -6854,7 +7139,7 @@ dnl waiting, we get occasional failures due to the following error:
  dnl "connect: Cannot assign requested address"
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::240])
  
@@ -12571,7 +12575,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -6909,13 +7190,13 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2])
+@@ -6909,13 +7194,13 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2])
  AT_CHECK([ovs-appctl dpctl/flush-conntrack])
  
  rm p0.pcap
@@ -12587,7 +12591,7 @@ index 808c492a22..07806d03d6 100644
  
  AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fc00::2)], [0], [dnl
  udp,orig=(src=fc00::1,dst=fc00::2,sport=<cleared>,dport=<cleared>),reply=(src=fc00::2,dst=fc00::240,sport=<cleared>,dport=<cleared>)
-@@ -6944,7 +7225,7 @@ table=0,in_port=ovs-p1,ct_state=+trk+rel+rpl,icmp6,actions=ovs-p0
+@@ -6944,7 +7229,7 @@ table=0,in_port=ovs-p1,ct_state=+trk+rel+rpl,icmp6,actions=ovs-p0
  AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
  
  rm p0.pcap
@@ -12596,7 +12600,7 @@ index 808c492a22..07806d03d6 100644
  OVS_WAIT_UNTIL([grep "listening" tcpdump0_err])
  
  dnl Send UDP packet from [[fc00::1]]:1234 to [[fc00::240]]:80
-@@ -7540,10 +7821,18 @@ table=2,priority=10  ct_state=+trk+est action=drop
+@@ -7540,10 +7825,18 @@ table=2,priority=10  ct_state=+trk+est action=drop
  
  AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
  
@@ -12618,7 +12622,7 @@ index 808c492a22..07806d03d6 100644
  
  sleep 1
  
-@@ -7587,12 +7876,12 @@ ADD_NATIVE_TUNNEL([geneve], [ns_gnv0], [at_ns0], [172.31.1.100], [10.1.1.1/24],
+@@ -7587,12 +7880,12 @@ ADD_NATIVE_TUNNEL([geneve], [ns_gnv0], [at_ns0], [172.31.1.100], [10.1.1.1/24],
                    [vni 0])
  
  dnl First, check the underlay
@@ -12633,7 +12637,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -7635,7 +7924,7 @@ table=2,in_port=ovs-server,ip,ct_state=+trk+rpl,actions=output:ovs-client
+@@ -7635,7 +7928,7 @@ table=2,in_port=ovs-server,ip,ct_state=+trk+rpl,actions=output:ovs-client
  AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
  
  rm server.pcap
@@ -12642,7 +12646,7 @@ index 808c492a22..07806d03d6 100644
  OVS_WAIT_UNTIL([grep "listening" tcpdump0_err])
  
  dnl Send UDP client->server
-@@ -7677,7 +7966,7 @@ dnl Check the ICMP error in reply direction
+@@ -7677,7 +7970,7 @@ dnl Check the ICMP error in reply direction
  AT_CHECK([ovs-appctl dpctl/flush-conntrack zone=42])
  
  rm client.pcap
@@ -12651,7 +12655,7 @@ index 808c492a22..07806d03d6 100644
  OVS_WAIT_UNTIL([grep "listening" tcpdump1_err])
  
  dnl Send UDP client->server
-@@ -7715,6 +8004,65 @@ AT_CHECK([ovs-pcap client.pcap | grep 000000002010000000002000], [0], [dnl
+@@ -7715,6 +8008,65 @@ AT_CHECK([ovs-pcap client.pcap | grep 000000002010000000002000], [0], [dnl
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
  
@@ -12717,7 +12721,7 @@ index 808c492a22..07806d03d6 100644
  AT_BANNER([IGMP])
  
  AT_SETUP([IGMP - flood under normal action])
-@@ -7819,7 +8167,7 @@ dnl CVLAN traffic should match the flow and drop
+@@ -7819,7 +8171,7 @@ dnl CVLAN traffic should match the flow and drop
  AT_CHECK([ovs-appctl revalidator/purge])
  AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:vlan-limit=1])
  AT_CHECK([ovs-ofctl add-flow br0 "priority=100 dl_type=0x8100 action=drop"])
@@ -12726,7 +12730,7 @@ index 808c492a22..07806d03d6 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -7869,11 +8217,11 @@ AT_CHECK([ovs-ofctl --bundle add-flows br2 flows-customer-br.txt])
+@@ -7869,11 +8221,11 @@ AT_CHECK([ovs-ofctl --bundle add-flows br2 flows-customer-br.txt])
  
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.2.2.2])
  
@@ -12740,7 +12744,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -7925,11 +8273,11 @@ AT_CHECK([ovs-ofctl --bundle add-flows br2 flows-customer-br.txt])
+@@ -7925,11 +8277,11 @@ AT_CHECK([ovs-ofctl --bundle add-flows br2 flows-customer-br.txt])
  
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.2.2.2])
  
@@ -12754,7 +12758,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -7977,24 +8325,24 @@ AT_CHECK([ovs-vsctl set port ovs-p2 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,2
+@@ -7977,24 +8329,24 @@ AT_CHECK([ovs-vsctl set port ovs-p2 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,2
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.2.2.2])
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.3.2.2])
  
@@ -12784,7 +12788,7 @@ index 808c492a22..07806d03d6 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP(["/dropping VLAN \(0\|300\) packet received on dot1q-tunnel port/d"])
  AT_CLEANUP
-@@ -8023,11 +8371,11 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows-br0.txt])
+@@ -8023,11 +8375,11 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows-br0.txt])
  
  OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.2.2.2])
  
@@ -12798,7 +12802,7 @@ index 808c492a22..07806d03d6 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -8049,21 +8397,29 @@ dnl The flow will encap a nsh header to the TCP syn packet
+@@ -8049,21 +8401,29 @@ dnl The flow will encap a nsh header to the TCP syn packet
  dnl eth/ip/tcp --> OVS --> eth/nsh/eth/ip/tcp
  AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,ip,actions=encap(nsh(md_type=1)),set_field:0x1234->nsh_spi,set_field:0x11223344->nsh_c1,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1"])
  
@@ -12841,7 +12845,7 @@ index 808c492a22..07806d03d6 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -8081,19 +8437,31 @@ dnl The flow will decap a nsh header which in turn carries a TCP syn packet
+@@ -8081,19 +8441,31 @@ dnl The flow will decap a nsh header which in turn carries a TCP syn packet
  dnl eth/nsh/eth/ip/tcp --> OVS --> eth/ip/tcp
  AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,dl_type=0x894f, actions=decap(),decap(), ovs-p1"])
  
@@ -12883,7 +12887,7 @@ index 808c492a22..07806d03d6 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -8113,22 +8481,38 @@ dnl The flow will add another NSH header with nsh_spi=0x101, nsh_si=4,
+@@ -8113,22 +8485,38 @@ dnl The flow will add another NSH header with nsh_spi=0x101, nsh_si=4,
  dnl nsh_ttl=7 and change the md1 context
  AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x03,actions=decap(),decap(),encap(nsh(md_type=1)),set_field:0x07->nsh_ttl,set_field:0x0101->nsh_spi,set_field:0x04->nsh_si,set_field:0x100f0e0d->nsh_c1,set_field:0x0c0b0a09->nsh_c2,set_field:0x08070605->nsh_c3,set_field:0x04030201->nsh_c4,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1"])
  
@@ -12936,7 +12940,7 @@ index 808c492a22..07806d03d6 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -8149,31 +8533,50 @@ dnl packet to to at_ns2.
+@@ -8149,31 +8537,50 @@ dnl packet to to at_ns2.
  AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x02,actions=ovs-p1"])
  AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x01,actions=ovs-p2"])
  
diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec
index f407f08..8800d98 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: 108%{?dist}
+Release: 109%{?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
+* Fri Nov 15 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.2.0-109
+- Merging upstream branch-3.2 [RH git: ec59c39dba]
+    Commit list:
+    69a3d4a437 tests: Fix transient failure in ping6 header modify. ()
+
+
 * Mon Nov 11 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.2.0-108
 - Merging upstream branch-3.2 [RH git: 4b5d54d8a5]
     Commit list: