diff --git a/SOURCES/openvswitch-2.16.0.patch b/SOURCES/openvswitch-2.16.0.patch index 4fd7071..dd23f9b 100644 --- a/SOURCES/openvswitch-2.16.0.patch +++ b/SOURCES/openvswitch-2.16.0.patch @@ -3274,7 +3274,7 @@ index 45a96b9be2..738fb44b3c 100644 return; } diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c -index 60dd138914..28b8f21a02 100644 +index 60dd138914..911f55fe74 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -627,6 +627,7 @@ netdev_linux_notify_sock(void) @@ -3305,6 +3305,15 @@ index 60dd138914..28b8f21a02 100644 block_id = netdev_get_block_id(master_netdev); if (!block_id) { netdev_close(master_netdev); +@@ -2623,7 +2626,7 @@ static void + nl_msg_act_police_end_nest(struct ofpbuf *request, size_t offset, + size_t act_offset) + { +- nl_msg_put_u32(request, TCA_POLICE_RESULT, TC_ACT_PIPE); ++ nl_msg_put_u32(request, TCA_POLICE_RESULT, TC_ACT_UNSPEC); + nl_msg_end_nested(request, offset); + nl_msg_end_nested(request, act_offset); + } @@ -6285,7 +6288,14 @@ get_stats_via_netlink(const struct netdev *netdev_, struct netdev_stats *stats) if (ofpbuf_try_pull(reply, NLMSG_HDRLEN + sizeof(struct ifinfomsg))) { const struct nlattr *a = nl_attr_find(reply, 0, IFLA_STATS64); diff --git a/SPECS/openvswitch2.16.spec b/SPECS/openvswitch2.16.spec index d38a50d..7e1bcea 100644 --- a/SPECS/openvswitch2.16.spec +++ b/SPECS/openvswitch2.16.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.16.0 -Release: 90%{?dist} +Release: 91%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -699,6 +699,12 @@ exit 0 %endif %changelog +* Fri Aug 05 2022 Open vSwitch CI - 2.16.0-91 +- Merging upstream branch-2.16 [RH git: ca5dd54f22] + Commit list: + e7792039e6 netdev-linux: set correct action for packets that passed policer + + * Thu Aug 04 2022 Open vSwitch CI - 2.16.0-90 - Merging upstream branch-2.16 [RH git: d31b5a2a53] Commit list: