Eliminate ODPL_* from userspace-facing interface.

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

diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h
index 23cf4ef..84c8ee2 100644 (file)
--- a/include/openvswitch/datapath-protocol.h
+++ b/include/openvswitch/datapath-protocol.h
@@ -92,7 +92,7 @@
 #define ODP_FLOW_DUMP           _IOWR('O', 17, struct odp_flow)
 #define ODP_FLOW_FLUSH          _IO('O', 19)
 
-#define ODP_EXECUTE             _IOR('O', 18, struct odp_execute)
+#define ODP_EXECUTE             _IOR('O', 18, struct odp_packet)
 
 /**
  * struct odp_datapath - header with basic information about a datapath.
@@ -137,7 +137,6 @@ struct odp_stats {
 
 /* Logical ports. */
 #define ODPP_LOCAL      ((uint16_t)0)
-#define ODPP_NONE       ((uint16_t)-1)
 
 /* Listening channels. */
 #define _ODPL_MISS_NR   0       /* Packet missed in flow table. */
@@ -350,14 +349,4 @@ enum odp_action_type {
 
 #define ODPAT_MAX (__ODPAT_MAX - 1)
 
-struct odp_execute {
-    uint32_t dp_idx;
-
-    struct nlattr *actions;
-    uint32_t actions_len;
-
-    const void *data;
-    uint32_t length;
-};
-
 #endif  /* openvswitch/datapath-protocol.h */