Merge branch 'mainstream'

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

diff --git a/OPENFLOW-1.1+ b/OPENFLOW-1.1+
index 329c5a2..753dbba 100644 (file)
--- a/OPENFLOW-1.1+
+++ b/OPENFLOW-1.1+
@@ -85,11 +85,6 @@ probably incomplete.
       feature.  This is partially merged.
       [optional for OF1.1+]
 
-    * SCTP.  Joe Stringer maintains a patch series that adds this
-      feature.  It has received review comments that need to be
-      addressed before it is merged.
-      [optional for OF1.1+]
-
     * Match and set double-tagged VLANs (QinQ).  This requires kernel
       work for reasonable performance.
       [optional for OF1.1+]
@@ -124,9 +119,6 @@ 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+]