X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fodp-compat.h;h=b18c31a6fc5db50f2c815f40ef36d910c70cd87f;hb=d656937779f5b987ec021c21189a0deab29fd64d;hp=fc6faa5346f29de8cef4fedb30ec1ff8cbcd4359;hpb=f1588b1fa1be46231ee079358e428dae74ff09cc;p=openvswitch

diff --git a/datapath/odp-compat.h b/datapath/odp-compat.h
index fc6faa53..b18c31a6 100644
--- a/datapath/odp-compat.h
+++ b/datapath/odp-compat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Nicira Networks.
+ * Copyright (c) 2010, 2011 Nicira Networks.
  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux
@@ -15,61 +15,17 @@
 #include "openvswitch/datapath-protocol.h"
 #include <linux/compat.h>
 
-#define ODP_VPORT_LIST32	_IOWR('O', 10, struct compat_odp_portvec)
-#define ODP_FLOW_GET32		_IOWR('O', 13, struct compat_odp_flow)
-#define ODP_FLOW_PUT32		_IOWR('O', 14, struct compat_odp_flow)
-#define ODP_FLOW_LIST32		_IOWR('O', 15, struct compat_odp_flowvec)
-#define ODP_FLOW_DEL32		_IOWR('O', 17, struct compat_odp_flow)
 #define ODP_EXECUTE32		_IOR('O', 18, struct compat_odp_execute)
-#define ODP_FLOW_DEL32		_IOWR('O', 17, struct compat_odp_flow)
-#define ODP_VPORT_ADD32		_IOR('O', 21, struct compat_odp_vport_add)
-#define ODP_VPORT_MOD32		_IOR('O', 22, struct compat_odp_vport_mod)
-
-struct compat_odp_portvec {
-	compat_uptr_t ports;
-	u32 n_ports;
-};
-
-struct compat_odp_flow {
-	struct odp_flow_stats stats;
-	struct odp_flow_key key;
-	compat_uptr_t actions;
-	u32 n_actions;
-	u32 flags;
-};
-
-struct compat_odp_flow_put {
-	struct compat_odp_flow flow;
-	u32 flags;
-};
-
-struct compat_odp_flowvec {
-	compat_uptr_t flows;
-	u32 n_flows;
-};
 
 struct compat_odp_execute {
-	u16 in_port;
-	u16 reserved1;
-	u32 reserved2;
+	uint32_t dp_idx;
 
 	compat_uptr_t actions;
-	u32 n_actions;
+	u32 actions_len;
 
 	compat_uptr_t data;
 	u32 length;
 };
-
-struct compat_odp_vport_add {
-	char port_type[VPORT_TYPE_SIZE];
-	char devname[16];	     /* IFNAMSIZ */
-	compat_uptr_t config;
-};
-
-struct compat_odp_vport_mod {
-	char devname[16];	     /* IFNAMSIZ */
-	compat_uptr_t config;
-};
 #endif	/* CONFIG_COMPAT */
 
 #endif	/* odp-compat.h */