X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fodp-compat.h;h=b03539aa790e0469f2379b92632dc8af8aa8755b;hb=4faaba2b90979e1106b8c9b0430481f2cc62364d;hp=669a5216a872bc4eabbcb40a0f620c7324a4f81c;hpb=45ca68cbadc3697ac95c53939d2877c6c2a3782e;p=openvswitch

diff --git a/datapath/odp-compat.h b/datapath/odp-compat.h
index 669a5216..b03539aa 100644
--- a/datapath/odp-compat.h
+++ b/datapath/odp-compat.h
@@ -15,15 +15,13 @@
 #include "openvswitch/datapath-protocol.h"
 #include <linux/compat.h>
 
-#define ODP_PORT_LIST32		_IOWR('O', 10, struct compat_odp_portvec)
-#define ODP_FLOW_GET32		_IOWR('O', 13, struct compat_odp_flow)
+#define ODP_VPORT_LIST32	_IOWR('O', 10, struct compat_odp_portvec)
+#define ODP_FLOW_GET32		_IOWR('O', 13, struct compat_odp_flowvec)
 #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;
@@ -34,7 +32,7 @@ struct compat_odp_flow {
 	struct odp_flow_stats stats;
 	struct odp_flow_key key;
 	compat_uptr_t actions;
-	u32 n_actions;
+	u32 actions_len;
 	u32 flags;
 };
 
@@ -49,27 +47,12 @@ struct compat_odp_flowvec {
 };
 
 struct compat_odp_execute {
-	u16 in_port;
-	u16 reserved1;
-	u32 reserved2;
-
 	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 */