[ovs-git] [openvswitch/ovs] 9ff2a5: meta-flow: fix a typo in "MPLS Bottom of Stack Fie...

[Timothy Redaelli]

  Branch: refs/heads/branch-2.11
  Home:   https://github.com/openvswitch/ovs
  Commit: 9ff2a5a11506524b766a0edd3860bbb3554e1819
      https://github.com/openvswitch/ovs/commit/9ff2a5a11506524b766a0edd3860bbb3554e1819
  Author: Timothy Redaelli <tredaelli at redhat.com>
  Date:   2020-08-26 (Wed, 26 Aug 2020)

  Changed paths:
    M lib/meta-flow.xml

  Log Message:
  -----------
  meta-flow: fix a typo in "MPLS Bottom of Stack Field" paragraph.

In the ovs-fields.7 manual page, the "MPLS Bottom of Stack Field" paragraph
says:
 * When mpls_bos is 1, there is another MPLS label following this one,
   so the Ethertype passed to pop_mpls should be an MPLS Ethertype. [...]

 * When mpls_bos is 0, this MPLS label is the last one, so the Ethertype
   passed to pop_mpls should be a non-MPLS Ethertype such as IPv4. [...]

The values 0 and 1 have been swapped: when BOS is 1,
then no more label stack entries follows.

Fixes: 96fee5e0a2a0 ("ovs-fields: New manpage to document Open vSwitch and OpenFlow fields.")
Reported-at: https://bugzilla.redhat.com/1842032
Reported-by: Guillaume Nault <gnault at redhat.com>
Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
Acked-by: Greg Rose <gvrose8192 at gmail.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>


  Commit: 1b842af7ad05b39b9275faac7fe3a7c7185b4b12
      https://github.com/openvswitch/ovs/commit/1b842af7ad05b39b9275faac7fe3a7c7185b4b12
  Author: Timothy Redaelli <tredaelli at redhat.com>
  Date:   2020-08-26 (Wed, 26 Aug 2020)

  Changed paths:
    M utilities/ovs-dpctl-top.in

  Log Message:
  -----------
  ovs-dpctl-top: Skip "eth()" element.

With commit efde188622ae ("odp-util: Print eth() for Ethernet flows if
packet_type is absent.") "eth()" is printed for Ethernet flows if packet_type
is absent, but this broke "ovs-dpctl-top" since it expects that every
element has a value.

This commit skips the parsing of the empty "eth()" element.

Fixes: efde188622ae ("odp-util: Print eth() for Ethernet flows if packet_type is absent.")
Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
Acked-by: Flavio Leitner <fbl at sysclose.org>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/05bbdfceb794...1b842af7ad05