datapath: Use consume_skb() on non-errors.

[openvswitch] / vswitchd / vswitch.xml

diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 214864682e6d679cd31c8443b778a53b40ea6e1a..4288ee6b37f50715b1449a4d1526165534f975cf 100644 (file)
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -536,8 +536,8 @@
           <p>Attempts to always assign a given flow to the same slave
             consistently.  In an effort to maintain stability, no load
             balancing is done.  Uses a similar hashing strategy to
-            <code>balance-tcp</code>, falling back to <code>balance-slb</code>
-            style hashing when LACP negotiations are unsuccessful.</p>
+            <code>balance-tcp</code>, always taking into account L3 and L4
+            fields even if LACP negotiations are unsuccessful. </p>
           <p>Slave selection decisions are made based on
             <code>bond-stable-id</code> if set.  Otherwise, OpenFlow port
             number is used.  Decisions are consistent across all ovs-vswitchd
@@ -1293,7 +1293,9 @@
 
       <column name="cfm_fault">
         Indicates a connectivity fault triggered by an inability to receive
-        heartbeats from the remote endpoint.
+        heartbeats from the remote endpoint.  When a fault is triggered on
+        <ref table="Interface"/>s participating in bonds, they will be
+        disabled.
       </column>
     </group>