datapath-protocol: Correct a description in odp_flow_attr structure.

[sliver-openvswitch.git] / include / openvswitch / datapath-protocol.h

diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h
index e7708ef..dd2bfb9 100644 (file)
--- a/include/openvswitch/datapath-protocol.h
+++ b/include/openvswitch/datapath-protocol.h
@@ -133,6 +133,7 @@ struct odp_stats {
     uint64_t n_hit;             /* Number of flow table matches. */
     uint64_t n_missed;          /* Number of flow table misses. */
     uint64_t n_lost;            /* Number of misses not sent to userspace. */
+    uint64_t n_flows;           /* Number of flows present */
 };
 
 /* Logical ports. */
@@ -145,7 +146,7 @@ enum odp_packet_cmd {
 
         /* Kernel-to-user notifications. */
         ODP_PACKET_CMD_MISS,    /* Flow table miss. */
-        ODP_PACKET_CMD_ACTION,  /* ODP_ACTION_ATTR_CONTROLLER action. */
+        ODP_PACKET_CMD_ACTION,  /* ODP_ACTION_ATTR_USERSPACE action. */
         ODP_PACKET_CMD_SAMPLE,  /* Sampled packet. */
 
         /* User commands. */
@@ -157,14 +158,14 @@ enum odp_packet_cmd {
  * @ODP_PACKET_ATTR_PACKET: Present for all notifications.  Contains the entire
  * packet as received, from the start of the Ethernet header onward.  For
  * %ODP_PACKET_CMD_ACTION, %ODP_PACKET_ATTR_PACKET reflects changes made by
- * actions preceding %ODP_ACTION_ATTR_CONTROLLER, but %ODP_PACKET_ATTR_KEY is
+ * actions preceding %ODP_ACTION_ATTR_USERSPACE, but %ODP_PACKET_ATTR_KEY is
  * the flow key extracted from the packet as originally received.
  * @ODP_PACKET_ATTR_KEY: Present for all notifications.  Contains the flow key
  * extracted from the packet as nested %ODP_KEY_ATTR_* attributes.  This allows
  * userspace to adapt its flow setup strategy by comparing its notion of the
  * flow key against the kernel's.
  * @ODP_PACKET_ATTR_USERDATA: Present for an %ODP_PACKET_CMD_ACTION
- * notification if the %ODP_ACTION_ATTR_CONTROLLER, action's argument was
+ * notification if the %ODP_ACTION_ATTR_USERSPACE, action's argument was
  * nonzero.
  * @ODP_PACKET_ATTR_SAMPLE_POOL: Present for %ODP_PACKET_CMD_SAMPLE.  Contains
  * the number of packets processed so far that were candidates for sampling.
@@ -179,7 +180,7 @@ enum odp_packet_attr {
        ODP_PACKET_ATTR_UNSPEC,
        ODP_PACKET_ATTR_PACKET,      /* Packet data. */
        ODP_PACKET_ATTR_KEY,         /* Nested ODP_KEY_ATTR_* attributes. */
-       ODP_PACKET_ATTR_USERDATA,    /* u64 ODP_ACTION_ATTR_CONTROLLER arg. */
+       ODP_PACKET_ATTR_USERDATA,    /* u64 ODP_ACTION_ATTR_USERSPACE arg. */
        ODP_PACKET_ATTR_SAMPLE_POOL, /* # sampling candidate packets so far. */
        ODP_PACKET_ATTR_ACTIONS,     /* Nested ODP_ACTION_ATTR_* attributes. */
        __ODP_PACKET_ATTR_MAX
@@ -371,10 +372,11 @@ struct odp_key_nd {
  * @ODP_FLOW_ATTR_KEY: Nested %ODP_KEY_ATTR_* attributes specifying the flow
  * key.  Always present in notifications.  Required for all requests (except
  * dumps).
- * @ODP_FLOW_ATTR_ACTIONS: Nested %ODPAT_* attributes specifying the actions to
- * take for packets that match the key.  Always present in notifications.
- * Required for %ODP_FLOW_CMD_NEW requests, optional on %ODP_FLOW_CMD_SET
- * request to change the existing actions, ignored for other requests.
+ * @ODP_FLOW_ATTR_ACTIONS: Nested %ODP_ACTION_ATTR_* attributes specifying
+ * the actions to take for packets that match the key.  Always present in
+ * notifications.  Required for %ODP_FLOW_CMD_NEW requests, optional
+ * on %ODP_FLOW_CMD_SET request to change the existing actions, ignored for
+ * other requests.
  * @ODP_FLOW_ATTR_STATS: &struct odp_flow_stats giving statistics for this
  * flow.  Present in notifications if the stats would be nonzero.  Ignored in
  * requests.
@@ -409,7 +411,7 @@ enum odp_flow_attr {
 enum odp_action_type {
        ODP_ACTION_ATTR_UNSPEC,
        ODP_ACTION_ATTR_OUTPUT,       /* Output to switch port. */
-       ODP_ACTION_ATTR_CONTROLLER,   /* Send copy to controller. */
+       ODP_ACTION_ATTR_USERSPACE,    /* Send copy to userspace. */
        ODP_ACTION_ATTR_SET_DL_TCI,   /* Set the 802.1q TCI value. */
        ODP_ACTION_ATTR_STRIP_VLAN,   /* Strip the 802.1q header. */
        ODP_ACTION_ATTR_SET_DL_SRC,   /* Ethernet source address. */