diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 5d43797..1bb532c 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -21155,7 +21155,7 @@ index 4381c618f1..059d3baed6 100644 return subtables_changed; } diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c -index ceb56c6851..16a5838019 100644 +index ceb56c6851..177033f956 100644 --- a/lib/dpif-netlink.c +++ b/lib/dpif-netlink.c @@ -56,6 +56,7 @@ @@ -21166,6 +21166,15 @@ index ceb56c6851..16a5838019 100644 #include "openvswitch/vlog.h" #include "packets.h" #include "random.h" +@@ -919,7 +920,7 @@ dpif_netlink_port_add_compat(struct dpif_netlink *dpif, struct netdev *netdev, + + ext_ofs = nl_msg_start_nested(&options, OVS_TUNNEL_ATTR_EXTENSION); + for (i = 0; i < 32; i++) { +- if (tnl_cfg->exts & (1 << i)) { ++ if (tnl_cfg->exts & (UINT32_C(1) << i)) { + nl_msg_put_flag(&options, i); + } + } @@ -1888,6 +1889,9 @@ dpif_netlink_operate__(struct dpif_netlink *dpif, aux->txn.reply = &aux->reply; } @@ -23452,6 +23461,52 @@ index 05bb48d66c..d93483245e 100644 const struct ovsdb_idl_row *ovsdb_idl_track_get_first( const struct ovsdb_idl *, const struct ovsdb_idl_table_class *); const struct ovsdb_idl_row *ovsdb_idl_track_get_next(const struct ovsdb_idl_row *); +diff --git a/lib/packets.c b/lib/packets.c +index 4a7643c5dd..60bb25c382 100644 +--- a/lib/packets.c ++++ b/lib/packets.c +@@ -1107,7 +1107,7 @@ packet_set_ipv4_addr(struct dp_packet *packet, + * + * This function assumes that L3 and L4 offsets are set in the packet. */ + static bool +-packet_rh_present(struct dp_packet *packet, uint8_t *nexthdr) ++packet_rh_present(struct dp_packet *packet, uint8_t *nexthdr, bool *first_frag) + { + const struct ovs_16aligned_ip6_hdr *nh; + size_t len; +@@ -1157,6 +1157,8 @@ packet_rh_present(struct dp_packet *packet, uint8_t *nexthdr) + const struct ovs_16aligned_ip6_frag *frag_hdr + = ALIGNED_CAST(struct ovs_16aligned_ip6_frag *, data); + ++ *first_frag = !(frag_hdr->ip6f_offlg & IP6F_OFF_MASK) && ++ (frag_hdr->ip6f_offlg & IP6F_MORE_FRAG); + *nexthdr = frag_hdr->ip6f_nxt; + len = sizeof *frag_hdr; + } else if (*nexthdr == IPPROTO_ROUTING) { +@@ -1287,18 +1289,20 @@ packet_set_ipv6(struct dp_packet *packet, const struct in6_addr *src, + uint8_t key_hl) + { + struct ovs_16aligned_ip6_hdr *nh = dp_packet_l3(packet); ++ bool recalc_csum = true; + uint8_t proto = 0; + bool rh_present; + +- rh_present = packet_rh_present(packet, &proto); ++ rh_present = packet_rh_present(packet, &proto, &recalc_csum); + + if (memcmp(&nh->ip6_src, src, sizeof(ovs_be32[4]))) { +- packet_set_ipv6_addr(packet, proto, nh->ip6_src.be32, src, true); ++ packet_set_ipv6_addr(packet, proto, nh->ip6_src.be32, ++ src, recalc_csum); + } + + if (memcmp(&nh->ip6_dst, dst, sizeof(ovs_be32[4]))) { + packet_set_ipv6_addr(packet, proto, nh->ip6_dst.be32, dst, +- !rh_present); ++ !rh_present && recalc_csum); + } + + packet_set_ipv6_tc(&nh->ip6_flow, key_tc); diff --git a/lib/pcap-file.c b/lib/pcap-file.c index f0cac8e0fa..7f5561f827 100644 --- a/lib/pcap-file.c @@ -27253,7 +27308,7 @@ index 9d5b5cffd0..45c9587eeb 100644 def ovs_vsctl_add_bridge(bridge): diff --git a/python/setup.py b/python/setup.py -index d385d83722..cfe01763f3 100644 +index d385d83722..f6eb777f9e 100644 --- a/python/setup.py +++ b/python/setup.py @@ -10,8 +10,6 @@ @@ -27274,6 +27329,15 @@ index d385d83722..cfe01763f3 100644 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', +@@ -106,6 +102,6 @@ except BuildFailed: + print("Retrying the build without the C extension.") + print("*" * 75) + +- del(setup_args['cmdclass']) +- del(setup_args['ext_modules']) ++ del setup_args['cmdclass'] ++ del setup_args['ext_modules'] + setuptools.setup(**setup_args) diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index 9b1a121f23..5f989bc9fd 100644 --- a/rhel/openvswitch-fedora.spec.in @@ -30504,10 +30568,52 @@ index 1714273e35..270956d13f 100644 dnl Delete ip address. AT_CHECK([ip addr del 10.0.0.17/24 dev p1-route], [0], [stdout]) diff --git a/tests/system-traffic.at b/tests/system-traffic.at -index fb5b9a36d2..61064ad051 100644 +index fb5b9a36d2..fd3f13f25b 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at -@@ -218,6 +218,7 @@ OVS_TRAFFIC_VSWITCHD_STOP +@@ -192,6 +192,41 @@ NS_CHECK_EXEC([at_ns0], [ping6 -s 3200 -q -c 3 -i 0.3 -w 2 fc00:1::2 | FORMAT_PI + OVS_TRAFFIC_VSWITCHD_STOP + AT_CLEANUP + ++AT_SETUP([datapath - ping6 between two ports with header modify]) ++OVS_TRAFFIC_VSWITCHD_START() ++ ++AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) ++ ++ADD_NAMESPACES(at_ns0, at_ns1) ++ ++ADD_VETH(p0, at_ns0, br0, "fc00::1/96", e4:11:22:33:44:55) ++ADD_VETH(p1, at_ns1, br0, "fc00::2/96", e4:11:22:33:44:54) ++NS_CHECK_EXEC([at_ns0], [ip -6 neigh add fc00::3 lladdr e4:11:22:33:44:54 dev p0]) ++NS_CHECK_EXEC([at_ns0], [ip -6 neigh add fc00::2 lladdr e4:11:22:33:44:54 dev p0]) ++NS_CHECK_EXEC([at_ns0], [ip -6 neigh add fc00::1 lladdr e4:11:22:33:44:55 dev p0]) ++ ++dnl Linux seems to take a little time to get its IPv6 stack in order. Without ++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::2]) ++ ++AT_CHECK([ovs-ofctl del-flows -OOpenFlow15 br0]) ++AT_CHECK([ovs-ofctl add-flow -OOpenFlow15 br0 in_port=ovs-p0,ipv6,ipv6_dst=fc00::3,ipv6_src=fc00::1,actions=set_field:fc00::2-\>ipv6_dst,ovs-p1]) ++AT_CHECK([ovs-ofctl add-flow -OOpenFlow15 br0 in_port=ovs-p1,ipv6,ipv6_dst=fc00::1,ipv6_src=fc00::2,actions=set_field:fc00::3-\>ipv6_src,ovs-p0]) ++ ++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 ++]) ++NS_CHECK_EXEC([at_ns0], [ping6 -s 1600 -q -c 3 -i 0.3 -w 2 fc00::3 | FORMAT_PING], [0], [dnl ++3 packets transmitted, 3 received, 0% packet loss, time 0ms ++]) ++NS_CHECK_EXEC([at_ns0], [ping6 -s 3200 -q -c 3 -i 0.3 -w 2 fc00::3 | FORMAT_PING], [0], [dnl ++3 packets transmitted, 3 received, 0% packet loss, time 0ms ++]) ++ ++OVS_TRAFFIC_VSWITCHD_STOP ++AT_CLEANUP ++ + AT_SETUP([datapath - ping over bond]) + OVS_TRAFFIC_VSWITCHD_START() + +@@ -218,6 +253,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over vxlan tunnel]) @@ -30515,7 +30621,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_VXLAN() OVS_TRAFFIC_VSWITCHD_START() -@@ -258,7 +259,55 @@ NS_CHECK_EXEC([at_ns0], [ping -s 3200 -q -c 3 -i 0.3 -w 2 10.1.1.100 | FORMAT_PI +@@ -258,7 +294,55 @@ NS_CHECK_EXEC([at_ns0], [ping -s 3200 -q -c 3 -i 0.3 -w 2 10.1.1.100 | FORMAT_PI OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP @@ -30571,7 +30677,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_VXLAN_UDP6ZEROCSUM() OVS_TRAFFIC_VSWITCHD_START() -@@ -302,6 +351,7 @@ OVS_TRAFFIC_VSWITCHD_STOP +@@ -302,6 +386,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over gre tunnel]) @@ -30579,7 +30685,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_KERNEL_EXCL(3, 10, 4, 15) OVS_CHECK_GRE() -@@ -343,6 +393,7 @@ OVS_TRAFFIC_VSWITCHD_STOP +@@ -343,6 +428,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over ip6gre L2 tunnel]) @@ -30587,7 +30693,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_KERNEL_EXCL(3, 10, 4, 15) OVS_CHECK_GRE() OVS_CHECK_ERSPAN() -@@ -383,6 +434,7 @@ AT_CLEANUP +@@ -383,6 +469,7 @@ AT_CLEANUP AT_SETUP([datapath - ping over erspan v1 tunnel]) @@ -30595,7 +30701,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_KERNEL_EXCL(3, 10, 4, 15) OVS_CHECK_GRE() OVS_CHECK_ERSPAN() -@@ -419,6 +471,7 @@ OVS_TRAFFIC_VSWITCHD_STOP +@@ -419,6 +506,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over erspan v2 tunnel]) @@ -30603,7 +30709,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_KERNEL_EXCL(3, 10, 4, 15) OVS_CHECK_GRE() OVS_CHECK_ERSPAN() -@@ -455,6 +508,7 @@ OVS_TRAFFIC_VSWITCHD_STOP +@@ -455,6 +543,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over ip6erspan v1 tunnel]) @@ -30611,7 +30717,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_KERNEL_EXCL(3, 10, 4, 15) OVS_CHECK_GRE() OVS_CHECK_ERSPAN() -@@ -494,6 +548,7 @@ OVS_TRAFFIC_VSWITCHD_STOP +@@ -494,6 +583,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over ip6erspan v2 tunnel]) @@ -30619,7 +30725,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_KERNEL_EXCL(3, 10, 4, 15) OVS_CHECK_GRE() OVS_CHECK_ERSPAN() -@@ -534,6 +589,7 @@ OVS_TRAFFIC_VSWITCHD_STOP +@@ -534,6 +624,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over geneve tunnel]) @@ -30627,7 +30733,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_GENEVE() OVS_TRAFFIC_VSWITCHD_START() -@@ -574,7 +630,63 @@ NS_CHECK_EXEC([at_ns0], [ping -s 3200 -q -c 3 -i 0.3 -w 2 10.1.1.100 | FORMAT_PI +@@ -574,7 +665,63 @@ NS_CHECK_EXEC([at_ns0], [ping -s 3200 -q -c 3 -i 0.3 -w 2 10.1.1.100 | FORMAT_PI OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP @@ -30691,7 +30797,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_GENEVE() OVS_TRAFFIC_VSWITCHD_START() -@@ -612,7 +724,7 @@ NS_CHECK_EXEC([at_ns0], [ping -q -c 3 10.1.1.100 | FORMAT_PING], [0], [dnl +@@ -612,7 +759,7 @@ NS_CHECK_EXEC([at_ns0], [ping -q -c 3 10.1.1.100 | FORMAT_PING], [0], [dnl ]) dnl Test OVS handles TLV map modifictions properly when restores frozen state. @@ -30700,7 +30806,7 @@ index fb5b9a36d2..61064ad051 100644 AT_CHECK([ovs-ofctl add-tlv-map br0 "{class=0xffff,type=0x88,len=4}->tun_metadata1"]) sleep 1 -@@ -626,6 +738,7 @@ OVS_TRAFFIC_VSWITCHD_STOP +@@ -626,6 +773,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over geneve6 tunnel]) @@ -30708,7 +30814,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_GENEVE_UDP6ZEROCSUM() OVS_TRAFFIC_VSWITCHD_START() -@@ -669,6 +782,7 @@ OVS_TRAFFIC_VSWITCHD_STOP +@@ -669,6 +817,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over gre tunnel by simulated packets]) @@ -30716,7 +30822,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_MIN_KERNEL(3, 10) OVS_TRAFFIC_VSWITCHD_START() -@@ -715,6 +829,7 @@ OVS_TRAFFIC_VSWITCHD_STOP +@@ -715,6 +864,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over erspan v1 tunnel by simulated packets]) @@ -30724,7 +30830,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_MIN_KERNEL(3, 10) OVS_TRAFFIC_VSWITCHD_START() -@@ -763,6 +878,7 @@ OVS_TRAFFIC_VSWITCHD_STOP +@@ -763,6 +913,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over erspan v2 tunnel by simulated packets]) @@ -30732,7 +30838,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_MIN_KERNEL(3, 10) OVS_TRAFFIC_VSWITCHD_START() -@@ -816,6 +932,7 @@ OVS_TRAFFIC_VSWITCHD_STOP +@@ -816,6 +967,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over ip6erspan v1 tunnel by simulated packets]) @@ -30740,7 +30846,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_MIN_KERNEL(3, 10) OVS_TRAFFIC_VSWITCHD_START() -@@ -871,6 +988,7 @@ OVS_TRAFFIC_VSWITCHD_STOP +@@ -871,6 +1023,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over ip6erspan v2 tunnel by simulated packets]) @@ -30748,7 +30854,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_CHECK_MIN_KERNEL(3, 10) OVS_TRAFFIC_VSWITCHD_START() -@@ -1927,6 +2045,111 @@ tcp,orig=(src=10.1.1.3,dst=10.1.1.4,sport=,dport=),reply=(src= +@@ -1927,6 +2080,111 @@ tcp,orig=(src=10.1.1.3,dst=10.1.1.4,sport=,dport=),reply=(src= OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP @@ -30860,7 +30966,7 @@ index fb5b9a36d2..61064ad051 100644 AT_SETUP([conntrack - multiple bridges]) CHECK_CONNTRACK() OVS_TRAFFIC_VSWITCHD_START( -@@ -2330,6 +2553,15 @@ NXST_FLOW reply: +@@ -2330,6 +2588,15 @@ NXST_FLOW reply: table=1, priority=100,ct_state=+est+trk,in_port=1 actions=output:2 ]) @@ -30876,7 +30982,7 @@ index fb5b9a36d2..61064ad051 100644 OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP -@@ -3251,6 +3483,46 @@ NS_CHECK_EXEC([at_ns0], [ping6 -s 3200 -q -c 3 -i 0.3 -w 2 fc00::2 | FORMAT_PING +@@ -3251,6 +3518,46 @@ NS_CHECK_EXEC([at_ns0], [ping6 -s 3200 -q -c 3 -i 0.3 -w 2 fc00::2 | FORMAT_PING OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP @@ -30923,7 +31029,7 @@ index fb5b9a36d2..61064ad051 100644 AT_SETUP([conntrack - resubmit to ct multiple times]) CHECK_CONNTRACK() -@@ -3410,15 +3682,15 @@ action=normal +@@ -3410,15 +3717,15 @@ action=normal AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt]) @@ -30942,7 +31048,7 @@ index fb5b9a36d2..61064ad051 100644 "1616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161610a, actions=ct(table=1)"]) AT_CHECK([ovs-appctl dpctl/dump-flows | head -2 | tail -1 | grep -q -e ["]udp[(]src=5001["]]) -@@ -4433,6 +4705,52 @@ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=,dport=),reply=(src= +@@ -4433,6 +4740,52 @@ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=,dport=),reply=(src= OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP @@ -30995,7 +31101,7 @@ index fb5b9a36d2..61064ad051 100644 AT_SETUP([conntrack - simple DNAT]) CHECK_CONNTRACK() CHECK_CONNTRACK_NAT() -@@ -4488,6 +4806,41 @@ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=,dport=),reply=(src= +@@ -4488,6 +4841,41 @@ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=,dport=),reply=(src= OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP @@ -31037,7 +31143,7 @@ index fb5b9a36d2..61064ad051 100644 AT_SETUP([conntrack - more complex DNAT]) CHECK_CONNTRACK() CHECK_CONNTRACK_NAT() -@@ -5682,7 +6035,7 @@ on_exit 'ovs-appctl revalidator/purge' +@@ -5682,7 +6070,7 @@ on_exit 'ovs-appctl revalidator/purge' on_exit 'ovs-appctl dpif/dump-flows br0' dnl Should work with the virtual IP address through NAT @@ -31046,7 +31152,7 @@ index fb5b9a36d2..61064ad051 100644 echo Request $i NS_CHECK_EXEC([at_ns1], [wget 10.1.1.64 -t 5 -T 1 --retry-connrefused -v -o wget$i.log]) done -@@ -5971,6 +6324,132 @@ AT_CHECK([ovs-ofctl dump-flows br0 | grep table=2, | OFPROTO_CLEAR_DURATION_IDLE +@@ -5971,6 +6359,132 @@ AT_CHECK([ovs-ofctl dump-flows br0 | grep table=2, | OFPROTO_CLEAR_DURATION_IDLE OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP @@ -31867,7 +31973,7 @@ index 15433e3472..c4845956ca 100644 idltest_simple3_index_destroy_row(equal); diff --git a/tests/test-ovsdb.py b/tests/test-ovsdb.py -index a196802743..123f89f081 100644 +index a196802743..01927f1851 100644 --- a/tests/test-ovsdb.py +++ b/tests/test-ovsdb.py @@ -162,6 +162,10 @@ def get_simple_printable_row_string(row, columns): @@ -32063,6 +32169,15 @@ index a196802743..123f89f081 100644 n += 1 if not n: +@@ -566,7 +620,7 @@ def update_condition(idl, commands): + commands = commands[len("condition "):].split(";") + for command in commands: + command = command.split(" ") +- if(len(command) != 2): ++ if len(command) != 2: + sys.stderr.write("Error parsing condition %s\n" % command) + sys.exit(1) + @@ -637,7 +691,8 @@ def do_idl(schema_file, remote, *commands): def mock_notify(event, row, updates=None): output = "%03d: " % step @@ -32447,6 +32562,19 @@ index e2e22c39ae..f7aa1418d8 100644 + utilities/usdt-scripts/upcall_cost.py include utilities/bugtool/automake.mk +diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in +index fa62cbe949..fee0de8532 100755 +--- a/utilities/bugtool/ovs-bugtool.in ++++ b/utilities/bugtool/ovs-bugtool.in +@@ -956,7 +956,7 @@ def load_plugins(just_capabilities=False, filter=None): + filters = [] + else: + filters = filters_tmp.split(',') +- if not(filter is None or filter in filters): ++ if not (filter is None or filter in filters): + continue + if el.tagName == "files": + newest_first = getBoolAttr(el, 'newest_first') diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py index bc6bfae15a..ac14da29b1 100755 --- a/utilities/checkpatch.py diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index b2ad6db..61d8ded 100644 --- a/SPECS/openvswitch2.15.spec +++ b/SPECS/openvswitch2.15.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.15.0 -Release: 113%{?dist} +Release: 114%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -702,6 +702,14 @@ exit 0 %endif %changelog +* Thu Aug 04 2022 Open vSwitch CI - 2.15.0-114 +- Merging upstream branch-2.15 [RH git: 61c9b3f738] + Commit list: + 8c0a187ea5 python: Fix E275 missing whitespace after keyword. + 84b05f4397 dpif-netlink: Fix incorrect bit shift in compat mode. + 506b9a7a22 packets: Re-calculate IPv6 checksum only for first frag upon modify. + + * Fri Jul 29 2022 Open vSwitch CI - 2.15.0-113 - Merging upstream branch-2.15 [RH git: d3374dc711] Commit list: