ofproto: Maximum value of "int" is INT_MAX, not UINT32_MAX.

[openvswitch] / include / openflow / nicira-ext.h

diff --git a/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h
index c2cd1ef54ef125bd979ce6a6787a41c538bafc0f..535cfc3ae070a6330742bf2029a4c3154375bcdd 100644 (file)
--- a/include/openflow/nicira-ext.h
+++ b/include/openflow/nicira-ext.h
@@ -37,27 +37,14 @@ enum nicira_type {
      * pairs in the form "key=value\n". */
     NXT_STATUS_REPLY,
 
-    /* Configure an action.  Most actions do not require configuration
-     * beyond that supplied in the actual action call. */
-    NXT_ACT_SET_CONFIG,
-
-    /* Get configuration of action. */
-    NXT_ACT_GET_CONFIG,
-
     /* No longer used. */
+    NXT_ACT_SET_CONFIG__OBSOLETE,
+    NXT_ACT_GET_CONFIG__OBSOLETE,
     NXT_COMMAND_REQUEST__OBSOLETE,
-
-    /* No longer used. */
     NXT_COMMAND_REPLY__OBSOLETE,
-
-    /* No longer used. */
     NXT_FLOW_END_CONFIG__OBSOLETE,
-
-    /* No longer used. */
     NXT_FLOW_END__OBSOLETE,
-
-    /* Management protocol.  See "openflow-mgmt.h". */
-    NXT_MGMT,
+    NXT_MGMT__OBSOLETE,
 };
 
 struct nicira_header {
@@ -70,7 +57,28 @@ OFP_ASSERT(sizeof(struct nicira_header) == 16);
 
 enum nx_action_subtype {
     NXAST_SNAT__OBSOLETE,           /* No longer used. */
-    NXAST_RESUBMIT                  /* Throw against flow table again. */
+
+    /* Searches the flow table again, using a flow that is slightly modified
+     * from the original lookup:
+     *
+     *    - The flow's in_port is changed to that specified in the 'in_port'
+     *      member of struct nx_action_resubmit.
+     *
+     *    - If NXAST_RESUBMIT is preceded by actions that affect the flow
+     *      (e.g. OFPAT_SET_VLAN_VID), then the flow is updated with the new
+     *      values.
+     *
+     * If the modified flow matches in the flow table, then the corresponding
+     * actions are executed, except that NXAST_RESUBMIT actions found in the
+     * secondary set of actions are ignored.  Afterward, actions following
+     * NXAST_RESUBMIT in the original set of actions, if any, are executed; any
+     * changes made to the packet (e.g. changes to VLAN) by secondary actions
+     * persist when those actions are executed, although the original in_port
+     * is restored.
+     *
+     * NXAST_RESUBMIT may be used any number of times within a set of actions.
+     */
+    NXAST_RESUBMIT
 };
 
 /* Action structure for NXAST_RESUBMIT. */