Merge branch 'mainstream'

[sliver-openvswitch.git] / OPENFLOW-1.1+

diff --git a/OPENFLOW-1.1+ b/OPENFLOW-1.1+
index 1b8a0ee..6fee77c 100644 (file)
--- a/OPENFLOW-1.1+
+++ b/OPENFLOW-1.1+
@@ -1,7 +1,7 @@
                 OpenFlow 1.1+ support in Open vSwitch
                 =====================================
 
                 OpenFlow 1.1+ support in Open vSwitch
                 =====================================
 

-Open vSwitch support for OpenFlow 1.1, 1.2, and 1.3 is a work in
+Open vSwitch support for OpenFlow 1.1 and beyond is a work in

 progress.  This file describes the work still to be done.
 
 The Plan
 progress.  This file describes the work still to be done.
 
 The Plan


@@ -54,11 +54,6 @@ OpenFlow 1.1
 The list of remaining work items for OpenFlow 1.1 is below.  It is
 probably incomplete.
 
 The list of remaining work items for OpenFlow 1.1 is below.  It is
 probably incomplete.
 

-    * OFPT_TABLE_MOD message.  This is new in OF1.1, so we need to
-      implement it.  It should be implemented so that the default OVS
-      behavior does not change.  Simon Horman has posted a patch.
-      [required for OF1.1 and OF1.2]
-

     * MPLS.  Simon Horman maintains a patch series that adds this
       feature.  This is partially merged.
       [optional for OF1.1+]
     * MPLS.  Simon Horman maintains a patch series that adds this
       feature.  This is partially merged.
       [optional for OF1.1+]