ovs-ofctl: Fix use-after-free error.

[openvswitch] / vswitchd / vswitch.xml

diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 5be9a4fd2a93f573ec9565b372b78a74963d097e..688f7157221619b8cfbbba2c781e17d4ccbe03d6 100644 (file)
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -569,6 +569,22 @@
           <dt><code>01:80:c2:00:00:0<var>x</var></code></dt>
           <dd>Other reserved protocols.</dd>
 
           <dt><code>01:80:c2:00:00:0<var>x</var></code></dt>
           <dd>Other reserved protocols.</dd>
 

+          <dt><code>00:00:5e:00:01:<var>x</var><var>x</var></code></dt>
+          <dd> VRRP IPv4 virtual router MAC address. </dd>
+
+          <dt><code>00:00:5e:00:02:<var>x</var><var>x</var></code></dt>
+          <dd> VRRP IPv6 virtual router MAC address. </dd>
+
+          <dt><code>00:00:0c:07:ac:<var>x</var><var>x</var></code></dt>
+          <dd> HSRP Version 1. </dd>
+
+          <dt><code>00:00:0c:9f:f<var>x</var>:<var>x</var><var>x</var></code>
+          </dt>
+          <dd> HSRP Version 2. </dd>
+
+          <dt><code>00:07:b4:<var>x</var><var>x</var>:<var>x</var><var>x</var>:<var>x</var><var>x</var></code></dt>
+          <dd> GLBP. </dd>
+

           <dt><code>01:00:0c:cc:cc:cc</code></dt>
           <dd>
             Cisco Discovery Protocol (CDP), VLAN Trunking Protocol (VTP),
           <dt><code>01:00:0c:cc:cc:cc</code></dt>
           <dd>
             Cisco Discovery Protocol (CDP), VLAN Trunking Protocol (VTP),


@@ -1753,11 +1769,6 @@
         frame having an invalid interval.
       </column>
 
         frame having an invalid interval.
       </column>
 

-      <column name="cfm_fault_status" key="sequence">
-        Indicates a CFM fault was triggered because the CFM module received
-        a CCM frame with a sequence number that it was not expecting.
-      </column>
-

       <column name="cfm_health">
         <p>
           Indicates the health of the interface as a percentage of CCM frames
       <column name="cfm_health">
         <p>
           Indicates the health of the interface as a percentage of CCM frames


@@ -2740,10 +2751,9 @@
         Service (QoS) on IP networks.
 
         The DSCP value specified here is used when establishing the connection
         Service (QoS) on IP networks.
 
         The DSCP value specified here is used when establishing the connection

-        between the controller and the Open vSwitch.  The connection must be
-        reset for the new DSCP values to take effect.  If no value is
-        specified, a default value of 48 is chosen.  Valid DSCP values must be
-        in the range 0 to 63.
+        between the controller and the Open vSwitch.  If no value is specified,
+        a default value of 48 is chosen.  Valid DSCP values must be in the
+        range 0 to 63.

       </column>
     </group>
 
       </column>
     </group>
 


@@ -2987,10 +2997,9 @@
         Service (QoS) on IP networks.
 
         The DSCP value specified here is used when establishing the connection
         Service (QoS) on IP networks.
 
         The DSCP value specified here is used when establishing the connection

-        between the manager and the Open vSwitch.  The connection must be
-        reset for the new DSCP values to take effect.  If no value is
-        specified, a default value of 48 is chosen.  Valid DSCP values must be
-        in the range 0 to 63.
+        between the manager and the Open vSwitch.  If no value is specified, a
+        default value of 48 is chosen.  Valid DSCP values must be in the range
+        0 to 63.

       </column>
     </group>
 
       </column>
     </group>