Merge branch 'mainstream'

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

diff --git a/OPENFLOW-1.1+ b/OPENFLOW-1.1+
index 190dd29..7a75c44 100644 (file)
--- a/OPENFLOW-1.1+
+++ b/OPENFLOW-1.1+
@@ -69,18 +69,6 @@ probably incomplete.
       behavior does not change.
       [required for OF1.1 and OF1.2]
 
-    * Flow table stats (OFPST_TABLE).
-
-        * Reference count (active entries)
-          [implemented]
-          [required for OF1.1 and OF1.2]
-
-        * Packet Lookups
-          [required for OF1.1; optional for OF1.2]
-
-        * Packet Matches
-          [required for OF1.1; optional for OF1.2]
-
     * MPLS.  Simon Horman maintains a patch series that adds this
       feature.  This is partially merged.
       [optional for OF1.1+]
@@ -113,20 +101,10 @@ probably incomplete.
 OpenFlow 1.2
 ------------
 
-OpenFlow 1.2 support requires OpenFlow 1.1 as a prerequisite, plus the
-following additional work.  (This is based on the change log at the
-end of the OF1.2 spec.  I didn't compare the specs carefully yet.)
-
-    * OFPT_FLOW_MOD:
-
-        * New flag OFPFF_RESET_COUNTS.
-          [required for OF1.2+]
-
-        * Add ability to delete flow in all tables.
-          [required for OF1.2+]
-
-        * Update DESIGN to describe OF1.2 behavior also.
-          [required for OF1.2+]
+OpenFlow 1.2 support requires OpenFlow 1.1 as a prerequisite. All the
+additional work specific to Openflow 1.2 are complete.  (This is based
+on the change log at the end of the OF1.2 spec.  I didn't compare the
+specs carefully yet.)
 
 OpenFlow 1.3
 ------------
@@ -190,9 +168,6 @@ didn't compare the specs carefully yet.)
       optimization in some cases for the software switch.
       [optional for OF1.3+]
 
-    * Duration Statistics
-      - New for Per Port, Per Queue, Per Group
-      [required for v1.3+]
 
 How to contribute
 -----------------