diff --git a/SOURCES/openvswitch-2.11.3.patch b/SOURCES/openvswitch-2.11.3.patch index 9793b45..40dc388 100644 --- a/SOURCES/openvswitch-2.11.3.patch +++ b/SOURCES/openvswitch-2.11.3.patch @@ -18385,9 +18385,18 @@ index 63b141d1ca..343dced587 100644 static int diff --git a/lib/tc.c b/lib/tc.c -index b19f075f2b..bb2336dab9 100644 +index b19f075f2b..ec3fef5ac2 100644 --- a/lib/tc.c +++ b/lib/tc.c +@@ -380,7 +380,7 @@ nl_parse_flower_mpls(struct nlattr **attrs, struct tc_flower *flower) + if (attrs[TCA_FLOWER_KEY_MPLS_BOS]) { + bos = nl_attr_get_u8(attrs[TCA_FLOWER_KEY_MPLS_BOS]); + set_mpls_lse_bos(&flower->key.mpls_lse, bos); +- set_mpls_lse_ttl(&flower->mask.mpls_lse, 0xff); ++ set_mpls_lse_bos(&flower->mask.mpls_lse, 0xff); + } + + if (attrs[TCA_FLOWER_KEY_MPLS_TC]) { @@ -571,6 +571,7 @@ nl_parse_flower_tunnel(struct nlattr **attrs, struct tc_flower *flower) ovs_be32 id = nl_attr_get_be32(attrs[TCA_FLOWER_KEY_ENC_KEY_ID]); diff --git a/SPECS/openvswitch2.11.spec b/SPECS/openvswitch2.11.spec index 354943f..9ec3c08 100644 --- a/SPECS/openvswitch2.11.spec +++ b/SPECS/openvswitch2.11.spec @@ -66,7 +66,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.11.3 -Release: 81%{?dist} +Release: 82%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -745,6 +745,10 @@ exit 0 %changelog +* Wed Feb 03 2021 Open vSwitch CI - 2.11.3-82 +- Merging upstream branch-2.11 + [2e04729b438263639f321cdebb0191e0de668fd9] + * Tue Feb 02 2021 Open vSwitch CI - 2.11.3-81 - Merging upstream branch-2.11 [a6fede58cbbb901bfa9fae88d59f088b005368b5]