X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fopenvswitch%2Fdatapath-protocol.h;h=426236cd543e01d06622acc30bd37f05c3868cf9;hb=be86ea7aa98b87079e266c91d139612fa8543edd;hp=8645096ab816e6014ede682ea0286e7fc3f7a08e;hpb=685a51a5b89750cead1b2934c2079d2bb9c52a4a;p=openvswitch

diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h
index 8645096a..426236cd 100644
--- a/include/openvswitch/datapath-protocol.h
+++ b/include/openvswitch/datapath-protocol.h
@@ -37,19 +37,9 @@
  * ----------------------------------------------------------------------
  */
 
-/* Protocol between userspace and kernel datapath.
- *
- * Be sure to update datapath/odp-compat.h if you change any of the structures
- * in here. */
-
 #ifndef OPENVSWITCH_DATAPATH_PROTOCOL_H
 #define OPENVSWITCH_DATAPATH_PROTOCOL_H 1
 
-/* The ovs_be<N> types indicate that an object is in big-endian, not
- * native-endian, byte order.  They are otherwise equivalent to uint<N>_t.
- * The Linux kernel already has __be<N> types for this, which take on
- * additional semantics when the "sparse" static checker is used, so we use
- * those types when compiling the kernel. */
 #ifdef __KERNEL__
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -61,12 +51,6 @@
 #include <sys/socket.h>
 #endif
 
-#ifndef __aligned_u64
-#define __aligned_u64 __u64 __attribute__((aligned(8)))
-#define __aligned_be64 __be64 __attribute__((aligned(8)))
-#define __aligned_le64 __le64 __attribute__((aligned(8)))
-#endif
-
 #include <linux/if_link.h>
 #include <linux/netlink.h>
 
@@ -149,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. */
@@ -161,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. */
@@ -173,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.
@@ -195,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
@@ -237,7 +222,8 @@ enum odp_vport_cmd {
  * @ODP_VPORT_ATTR_STATS: A &struct rtnl_link_stats64 giving statistics for
  * packets sent or received through the vport.
  * @ODP_VPORT_ATTR_ADDRESS: A 6-byte Ethernet address for the vport.
- * @ODP_VPORT_ATTR_MTU: MTU for the vport.
+ * @ODP_VPORT_ATTR_MTU: MTU for the vport.  Omitted if the vport does not have
+ * an MTU as, e.g., some tunnels do not.
  * @ODP_VPORT_ATTR_IFINDEX: ifindex of the underlying network device, if any.
  * @ODP_VPORT_ATTR_IFLINK: ifindex of the device on which packets are sent (for
  * tunnels), if any.
@@ -424,7 +410,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. */
@@ -437,7 +423,6 @@ enum odp_action_type {
 	ODP_ACTION_ATTR_SET_TUNNEL,   /* Set the encapsulating tunnel ID. */
 	ODP_ACTION_ATTR_SET_PRIORITY, /* Set skb->priority. */
 	ODP_ACTION_ATTR_POP_PRIORITY, /* Restore original skb->priority. */
-	ODP_ACTION_ATTR_DROP_SPOOFED_ARP, /* Drop ARPs with spoofed source MAC. */
 	__ODP_ACTION_ATTR_MAX
 };