datapath: Eliminate 'flags' member from odp_flow.

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

diff --git a/datapath/odp-compat.h b/datapath/odp-compat.h
index b03539a..bccfaf9 100644 (file)
--- 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,25 +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_flowvec)
+#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_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)
 
-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 actions_len;
-       u32 flags;
 };
 
 struct compat_odp_flow_put {
@@ -41,9 +35,9 @@ struct compat_odp_flow_put {
        u32 flags;
 };
 
-struct compat_odp_flowvec {
-       compat_uptr_t flows;
-       u32 n_flows;
+struct compat_odp_flow_dump {
+       compat_uptr_t flow;
+       uint32_t state[2];
 };
 
 struct compat_odp_execute {