datapath: Change userspace vport interface to use Netlink attributes.

[sliver-openvswitch.git] / datapath / odp-compat.h

diff --git a/datapath/odp-compat.h b/datapath/odp-compat.h
index fc6faa5..11089dd 100644 (file)
--- a/datapath/odp-compat.h
+++ b/datapath/odp-compat.h
@@ -15,26 +15,19 @@
 #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_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_DUMP32                _IOWR('O', 15, struct compat_odp_flow_dump)
 #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 key;
+       u32 key_len;
        compat_uptr_t actions;
-       u32 n_actions;
+       u32 actions_len;
        u32 flags;
 };
 
@@ -43,33 +36,23 @@ struct compat_odp_flow_put {
        u32 flags;
 };
 
+struct compat_odp_flow_dump {
+       compat_uptr_t flow;
+       uint32_t state[2];
+};
+
 struct compat_odp_flowvec {
        compat_uptr_t flows;
        u32 n_flows;
 };
 
 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 */