Disable OF1.4 in ovs-vswitchd and ovs-ofctl without specially enabling.

[sliver-openvswitch.git] / vswitchd / vswitch.xml

diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index e915caf..b0a8577 100644 (file)
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -136,28 +136,6 @@
         </p>
       </column>
 
-      <column name="other_config" key="force-miss-model">
-        <p>
-          Specifies userspace behaviour for handling flow misses. This takes
-          precedence over flow-eviction-threshold.
-        </p>
-        <p>
-          <dl>
-            <dt><code>auto</code></dt>
-            <dd>Handle automatically based on the flow-eviction-threshold and
-            the flow setup governer (default, recommended).</dd>
-            <dt><code>with-facets</code></dt>
-            <dd>Always create facets. Expensive kernel flow creation and
-            statistics tracking is always performed, even on flows with only
-            a small number of packets.</dd>
-            <dt><code>without-facets</code></dt>
-            <dd>Always handle without facets. Forces flow misses to be handled
-            in userspace. May cause an increase in CPU usage and packet loss
-            on high throughput.</dd>
-          </dl>
-        </p>
-      </column>
-
       <column name="other_config" key="n-handler-threads"
               type='{"type": "integer", "minInteger": 1}'>
         <p>
@@ -587,9 +565,22 @@
       </column>
 
       <column name="protocols">
-        List of OpenFlow protocols that may be used when negotiating a
-        connection with a controller.  A default value of
-        <code>OpenFlow10</code> will be used if this column is empty.
+       <p>
+         List of OpenFlow protocols that may be used when negotiating a
+         connection with a controller.  A default value of
+         <code>OpenFlow10</code> will be used if this column is empty.
+       </p>
+
+       <p>
+         The current implementation of OpenFlow 1.4 support is not safe:
+         <code>ovs-vswitchd</code> will abort when certain unimplemented
+         features are tested.  Thus, for now it is suitable only for
+         experimental use.  For this reason, OpenFlow 1.4 is supported only
+         if, in addition to specifying <code>OpenFlow14</code> in this field,
+         <code>ovs-vswitchd</code> is invoked with the
+         <code>--enable-of14</code> option.  (When support becomes safe, this
+         option will be removed.)
+       </p>
       </column>
     </group>