diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch
index 016057e..831b072 100644
--- a/SOURCES/openvswitch-3.1.0.patch
+++ b/SOURCES/openvswitch-3.1.0.patch
@@ -16763,7 +16763,7 @@ index 871a3bda4f..3d84a53182 100644
  ])
  
 diff --git a/tests/system-traffic.at b/tests/system-traffic.at
-index 221d96aefb..0dfc480e95 100644
+index 221d96aefb..f9bb67a63b 100644
 --- a/tests/system-traffic.at
 +++ b/tests/system-traffic.at
 @@ -10,13 +10,13 @@ ADD_NAMESPACES(at_ns0, at_ns1)
@@ -16894,11 +16894,15 @@ index 221d96aefb..0dfc480e95 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
  ])
@@ -16911,7 +16915,7 @@ index 221d96aefb..0dfc480e95 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])
  
@@ -16928,7 +16932,7 @@ index 221d96aefb..0dfc480e95 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
@@ -16951,7 +16955,7 @@ index 221d96aefb..0dfc480e95 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
@@ -16973,7 +16977,7 @@ index 221d96aefb..0dfc480e95 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
@@ -16996,7 +17000,7 @@ index 221d96aefb..0dfc480e95 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
@@ -17019,7 +17023,7 @@ index 221d96aefb..0dfc480e95 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
@@ -17034,7 +17038,7 @@ index 221d96aefb..0dfc480e95 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
@@ -17049,7 +17053,7 @@ index 221d96aefb..0dfc480e95 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
@@ -17064,7 +17068,7 @@ index 221d96aefb..0dfc480e95 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
@@ -17079,7 +17083,7 @@ index 221d96aefb..0dfc480e95 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
@@ -17094,7 +17098,7 @@ index 221d96aefb..0dfc480e95 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
@@ -17117,7 +17121,7 @@ index 221d96aefb..0dfc480e95 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
@@ -17132,7 +17136,7 @@ index 221d96aefb..0dfc480e95 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
@@ -17155,7 +17159,7 @@ index 221d96aefb..0dfc480e95 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.
@@ -17170,7 +17174,7 @@ index 221d96aefb..0dfc480e95 100644
  sleep 1
  
  dnl Generate a single packet trough the controler that needs an ARP modification
-@@ -903,6 +903,83 @@ ovs-pcap p0.pcap
+@@ -903,6 +907,83 @@ 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
  
@@ -17254,7 +17258,7 @@ index 221d96aefb..0dfc480e95 100644
  AT_SETUP([datapath - ping over gre tunnel by simulated packets])
  OVS_CHECK_TUNNEL_TSO()
  OVS_CHECK_MIN_KERNEL(3, 10)
-@@ -930,7 +1007,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -i p0 dst host 172.31.1.1 -l > p0.pcap 2>/
+@@ -930,7 +1011,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.
@@ -17263,7 +17267,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -978,7 +1055,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -x -i p0 dst host 172.31.1.1 -l > p0.pcap
+@@ -978,7 +1059,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
@@ -17272,7 +17276,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -1031,7 +1108,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -x -i p0 dst host 172.31.1.1 -l > p0.pcap
+@@ -1031,7 +1112,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.
@@ -17281,7 +17285,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -1088,7 +1165,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -x -i p0 dst host fc00:100::1 -l > p0.pcap
+@@ -1088,7 +1169,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.
@@ -17290,7 +17294,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -1144,7 +1221,7 @@ NETNS_DAEMONIZE([at_ns0], [tcpdump -n -x -i p0 dst host fc00:100::1 -l > p0.pcap
+@@ -1144,7 +1225,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.
@@ -17299,7 +17303,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -1183,7 +1260,7 @@ priority=10 in_port=2,ip,actions=clone(mod_dl_src(ae:c6:7e:54:8d:4d),mod_dl_dst(
+@@ -1183,7 +1264,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])
@@ -17308,7 +17312,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -1224,11 +1301,11 @@ table=1,priority=10 actions=normal
+@@ -1224,11 +1305,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])
  
@@ -17322,7 +17326,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -1263,11 +1340,11 @@ table=3,priority=10 actions=normal
+@@ -1263,11 +1344,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])
  
@@ -17336,7 +17340,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  OVS_TRAFFIC_VSWITCHD_STOP
-@@ -1938,7 +2015,7 @@ add in_port=ovs-p1,actions=ovs-p0,br0
+@@ -1938,7 +2019,7 @@ add in_port=ovs-p1,actions=ovs-p0,br0
  ])
  AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
  
@@ -17345,7 +17349,7 @@ index 221d96aefb..0dfc480e95 100644
  10 packets transmitted, 10 received, 0% packet loss, time 0ms
  ])
  
-@@ -1957,7 +2034,7 @@ modify in_port=ovs-p1,actions=ovs-p0
+@@ -1957,7 +2038,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])
  
@@ -17354,7 +17358,7 @@ index 221d96aefb..0dfc480e95 100644
  10 packets transmitted, 10 received, 0% packet loss, time 0ms
  ])
  
-@@ -1972,7 +2049,7 @@ recirc_id(<recirc>),in_port(3),eth_type(0x0800),ipv4(frag=no), packets:19, bytes
+@@ -1972,7 +2053,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])
  
@@ -17363,7 +17367,7 @@ index 221d96aefb..0dfc480e95 100644
  10 packets transmitted, 10 received, 0% packet loss, time 0ms
  ])
  
-@@ -1987,6 +2064,72 @@ recirc_id(<recirc>),in_port(3),eth_type(0x0800),ipv4(frag=no), packets:29, bytes
+@@ -1987,6 +2068,72 @@ recirc_id(<recirc>),in_port(3),eth_type(0x0800),ipv4(frag=no), packets:29, bytes
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
  
@@ -17436,7 +17440,7 @@ index 221d96aefb..0dfc480e95 100644
  AT_BANNER([MPLS])
  
  AT_SETUP([mpls - encap header dp-support])
-@@ -2004,20 +2147,29 @@ dnl The flow will encap a mpls header to the ip packet
+@@ -2004,20 +2151,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"])
  
@@ -17477,7 +17481,7 @@ index 221d96aefb..0dfc480e95 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -2036,20 +2188,29 @@ dnl The flow will encap a mpls header to the ip packet
+@@ -2036,20 +2192,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"])
  
@@ -17518,7 +17522,7 @@ index 221d96aefb..0dfc480e95 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -2069,20 +2230,29 @@ dnl The flow will encap a mpls header to the ip packet
+@@ -2069,20 +2234,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"])
  
@@ -17559,7 +17563,7 @@ index 221d96aefb..0dfc480e95 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -2101,20 +2271,29 @@ dnl The flow will encap a mpls header to the ip packet
+@@ -2101,20 +2275,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"])
  
@@ -17600,7 +17604,7 @@ index 221d96aefb..0dfc480e95 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -2135,24 +2314,30 @@ dnl eth/mpls/eth/ip/icmp --> OVS --> eth/ip/icmp
+@@ -2135,24 +2318,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"])
  
@@ -17646,7 +17650,7 @@ index 221d96aefb..0dfc480e95 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -2172,24 +2357,30 @@ dnl eth/mpls/eth/ip/icmp --> OVS --> eth/ip/icmp
+@@ -2172,24 +2361,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"])
  
@@ -17692,7 +17696,7 @@ index 221d96aefb..0dfc480e95 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -2343,6 +2534,7 @@ AT_CLEANUP
+@@ -2343,6 +2538,7 @@ AT_CLEANUP
  
  AT_SETUP([conntrack - ct flush])
  CHECK_CONNTRACK()
@@ -17700,7 +17704,7 @@ index 221d96aefb..0dfc480e95 100644
  OVS_TRAFFIC_VSWITCHD_START()
  
  ADD_NAMESPACES(at_ns0, at_ns1)
-@@ -2353,15 +2545,15 @@ ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
+@@ -2353,15 +2549,15 @@ 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
@@ -17720,7 +17724,7 @@ index 221d96aefb..0dfc480e95 100644
                           [ovs-ofctl ct-flush br0]], [
  AS_BOX([Testing with FLUSH_CMD])
  
-@@ -2389,7 +2581,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
+@@ -2389,7 +2585,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
@@ -17729,7 +17733,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -2504,8 +2696,67 @@ udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.
+@@ -2504,8 +2700,67 @@ 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 zone=5 '' 'ct_nw_src=10.1.1.1'])
  
  AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [1])
@@ -17797,7 +17801,7 @@ index 221d96aefb..0dfc480e95 100644
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
  
-@@ -2530,7 +2781,7 @@ priority=100,in_port=2,icmp,ct_state=+trk+est,action=1
+@@ -2530,7 +2785,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.
@@ -17806,7 +17810,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -2538,7 +2789,10 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+@@ -2538,7 +2793,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)
  ])
  
@@ -17818,7 +17822,7 @@ index 221d96aefb..0dfc480e95 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
-@@ -2571,7 +2825,7 @@ priority=100,in_port=2,icmp,ct_state=+trk+est,action=1
+@@ -2571,7 +2829,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.
@@ -17827,7 +17831,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -2671,7 +2925,7 @@ NS_CHECK_EXEC([at_ns1], [ping6 -q -c 3 -i 0.3 -w 2 fc00::1 | FORMAT_PING], [0],
+@@ -2671,7 +2929,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.
@@ -17836,7 +17840,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -2679,6 +2933,11 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fc00::2)], [0], [dnl
+@@ -2679,6 +2937,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)
  ])
  
@@ -17848,7 +17852,7 @@ index 221d96aefb..0dfc480e95 100644
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
  
-@@ -3579,12 +3838,12 @@ dnl Modify userspace conntrack fragmentation handling.
+@@ -3579,12 +3842,12 @@ dnl Modify userspace conntrack fragmentation handling.
  DPCTL_MODIFY_FRAGMENTATION()
  
  dnl Ipv4 fragmentation connectivity check.
@@ -17863,7 +17867,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -3656,12 +3915,12 @@ dnl Modify userspace conntrack fragmentation handling.
+@@ -3656,12 +3919,12 @@ dnl Modify userspace conntrack fragmentation handling.
  DPCTL_MODIFY_FRAGMENTATION()
  
  dnl Ipv4 fragmentation connectivity check.
@@ -17878,7 +17882,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -3701,22 +3960,22 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+@@ -3701,22 +3964,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.
@@ -17905,7 +17909,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -3875,12 +4134,12 @@ dnl "connect: Cannot assign requested address"
+@@ -3875,12 +4138,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.
@@ -17920,7 +17924,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -3957,12 +4216,12 @@ dnl "connect: Cannot assign requested address"
+@@ -3957,12 +4220,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.
@@ -17935,7 +17939,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -4000,22 +4259,22 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+@@ -4000,22 +4263,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.
@@ -17962,7 +17966,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -4226,18 +4485,18 @@ ADD_NATIVE_TUNNEL([vxlan], [at_vxlan1], [at_ns0], [172.31.1.100], [10.1.1.1/24],
+@@ -4226,18 +4489,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
@@ -17985,7 +17989,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -4286,18 +4545,18 @@ dnl "connect: Cannot assign requested address"
+@@ -4286,18 +4549,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
@@ -18008,7 +18012,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -4410,7 +4669,7 @@ dnl The default udp_single and icmp_first timeouts are 30 seconds in
+@@ -4410,7 +4673,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
@@ -18017,7 +18021,7 @@ index 221d96aefb..0dfc480e95 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)"])
-@@ -4436,7 +4695,7 @@ done
+@@ -4436,7 +4699,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
@@ -18026,7 +18030,7 @@ index 221d96aefb..0dfc480e95 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)"])
-@@ -4454,7 +4713,7 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+@@ -4454,7 +4717,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
@@ -18035,7 +18039,7 @@ index 221d96aefb..0dfc480e95 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)"])
-@@ -4475,7 +4734,7 @@ dnl Set the timeout policy to default again.
+@@ -4475,7 +4738,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
@@ -18044,7 +18048,7 @@ index 221d96aefb..0dfc480e95 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)"])
-@@ -4668,7 +4927,7 @@ table=2,in_port=1,ip,ct_state=+trk+est,ct_zone=2,action=LOCAL
+@@ -4668,7 +4931,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])
  
@@ -18053,7 +18057,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -4739,7 +4998,7 @@ table=4,priority=100,ip,action=output:NXM_NX_REG0[[]]
+@@ -4739,7 +5002,7 @@ table=4,priority=100,ip,action=output:NXM_NX_REG0[[]]
  
  AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
  
@@ -18062,7 +18066,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -5434,11 +5693,11 @@ ADD_NAMESPACES(at_ns0, at_ns1)
+@@ -5434,11 +5697,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")
@@ -18076,7 +18080,7 @@ index 221d96aefb..0dfc480e95 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
-@@ -5462,17 +5721,29 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+@@ -5462,17 +5725,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])
@@ -18110,7 +18114,7 @@ index 221d96aefb..0dfc480e95 100644
  AT_CLEANUP
  
  AT_SETUP([conntrack - more complex SNAT])
-@@ -5763,7 +6034,7 @@ table=10 priority=0 action=drop
+@@ -5763,7 +6038,7 @@ table=10 priority=0 action=drop
  AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
  
  rm p0.pcap
@@ -18119,7 +18123,7 @@ index 221d96aefb..0dfc480e95 100644
  sleep 1
  
  dnl UDP packets from ns0->ns1 should solicit "destination unreachable" response.
-@@ -5787,7 +6058,7 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=
+@@ -5787,7 +6062,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
  ])
  
@@ -18128,7 +18132,7 @@ index 221d96aefb..0dfc480e95 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -6477,7 +6748,7 @@ dnl waiting, we get occasional failures due to the following error:
+@@ -6477,7 +6752,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])
  
@@ -18137,7 +18141,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -6531,13 +6802,13 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2])
+@@ -6531,13 +6806,13 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2])
  AT_CHECK([ovs-appctl dpctl/flush-conntrack])
  
  rm p0.pcap
@@ -18153,7 +18157,7 @@ index 221d96aefb..0dfc480e95 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>)
-@@ -7125,10 +7396,18 @@ table=2,priority=10  ct_state=+trk+est action=drop
+@@ -7125,10 +7400,18 @@ table=2,priority=10  ct_state=+trk+est action=drop
  
  AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
  
@@ -18175,7 +18179,7 @@ index 221d96aefb..0dfc480e95 100644
  
  sleep 1
  
-@@ -7172,12 +7451,12 @@ ADD_NATIVE_TUNNEL([geneve], [ns_gnv0], [at_ns0], [172.31.1.100], [10.1.1.1/24],
+@@ -7172,12 +7455,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
@@ -18190,7 +18194,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -7220,7 +7499,7 @@ table=2,in_port=ovs-server,ip,ct_state=+trk+rpl,actions=output:ovs-client
+@@ -7220,7 +7503,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
@@ -18199,7 +18203,7 @@ index 221d96aefb..0dfc480e95 100644
  OVS_WAIT_UNTIL([grep "listening" tcpdump0_err])
  
  dnl Send UDP client->server
-@@ -7262,7 +7541,7 @@ dnl Check the ICMP error in reply direction
+@@ -7262,7 +7545,7 @@ dnl Check the ICMP error in reply direction
  AT_CHECK([ovs-appctl dpctl/flush-conntrack zone=42])
  
  rm client.pcap
@@ -18208,7 +18212,7 @@ index 221d96aefb..0dfc480e95 100644
  OVS_WAIT_UNTIL([grep "listening" tcpdump1_err])
  
  dnl Send UDP client->server
-@@ -7300,6 +7579,65 @@ AT_CHECK([ovs-pcap client.pcap | grep 000000002010000000002000], [0], [dnl
+@@ -7300,6 +7583,65 @@ AT_CHECK([ovs-pcap client.pcap | grep 000000002010000000002000], [0], [dnl
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
  
@@ -18274,7 +18278,7 @@ index 221d96aefb..0dfc480e95 100644
  AT_BANNER([IGMP])
  
  AT_SETUP([IGMP - flood under normal action])
-@@ -7404,7 +7742,7 @@ dnl CVLAN traffic should match the flow and drop
+@@ -7404,7 +7746,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"])
@@ -18283,7 +18287,7 @@ index 221d96aefb..0dfc480e95 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -7454,11 +7792,11 @@ AT_CHECK([ovs-ofctl --bundle add-flows br2 flows-customer-br.txt])
+@@ -7454,11 +7796,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])
  
@@ -18297,7 +18301,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -7510,11 +7848,11 @@ AT_CHECK([ovs-ofctl --bundle add-flows br2 flows-customer-br.txt])
+@@ -7510,11 +7852,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])
  
@@ -18311,7 +18315,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -7562,24 +7900,24 @@ AT_CHECK([ovs-vsctl set port ovs-p2 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,2
+@@ -7562,24 +7904,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])
  
@@ -18341,7 +18345,7 @@ index 221d96aefb..0dfc480e95 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP(["/dropping VLAN \(0\|300\) packet received on dot1q-tunnel port/d"])
  AT_CLEANUP
-@@ -7608,11 +7946,11 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows-br0.txt])
+@@ -7608,11 +7950,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])
  
@@ -18355,7 +18359,7 @@ index 221d96aefb..0dfc480e95 100644
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
  
-@@ -7634,21 +7972,29 @@ dnl The flow will encap a nsh header to the TCP syn packet
+@@ -7634,21 +7976,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"])
  
@@ -18398,7 +18402,7 @@ index 221d96aefb..0dfc480e95 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -7666,19 +8012,31 @@ dnl The flow will decap a nsh header which in turn carries a TCP syn packet
+@@ -7666,19 +8016,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"])
  
@@ -18440,7 +18444,7 @@ index 221d96aefb..0dfc480e95 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -7698,22 +8056,38 @@ dnl The flow will add another NSH header with nsh_spi=0x101, nsh_si=4,
+@@ -7698,22 +8060,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"])
  
@@ -18493,7 +18497,7 @@ index 221d96aefb..0dfc480e95 100644
  
  OVS_TRAFFIC_VSWITCHD_STOP
  AT_CLEANUP
-@@ -7734,31 +8108,50 @@ dnl packet to to at_ns2.
+@@ -7734,31 +8112,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.1.spec b/SPECS/openvswitch3.1.spec
index 54d6d67..0a5c8ef 100644
--- a/SPECS/openvswitch3.1.spec
+++ b/SPECS/openvswitch3.1.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.1.0
-Release: 138%{?dist}
+Release: 139%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -756,6 +756,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Nov 15 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-139
+- Merging upstream branch-3.1 [RH git: 4c67768003]
+    Commit list:
+    d3087648ff tests: Fix transient failure in ping6 header modify. ()
+
+
 * Mon Nov 11 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-138
 - Merging upstream branch-3.1 [RH git: 60d7cf7845]
     Commit list: