[ovs-dev] [PATCH 2/2] datapath: Correct argument size for ODP_FLOW_GET.

Ben Pfaff blp at nicira.com
Wed Dec 22 17:32:50 UTC 2010


ODP_FLOW_GET takes an odp_flowvec, not an odp_flow.

(This would merely introduce a gratuitous ABI incompatibility for the sake
of pedantic correctness, except that we're breaking the ABI regularly
anyhow.)

Signed-off-by: Ben Pfaff <blp at nicira.com>
---
 datapath/odp-compat.h                   |    2 +-
 include/openvswitch/datapath-protocol.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/datapath/odp-compat.h b/datapath/odp-compat.h
index 7ae5df6..b03539a 100644
--- a/datapath/odp-compat.h
+++ b/datapath/odp-compat.h
@@ -16,7 +16,7 @@
 #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_DEL32		_IOWR('O', 17, struct compat_odp_flow)
diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h
index db135c8..b8f93de 100644
--- a/include/openvswitch/datapath-protocol.h
+++ b/include/openvswitch/datapath-protocol.h
@@ -87,7 +87,7 @@
 #define ODP_VPORT_QUERY         _IOWR('O', 9, struct odp_port)
 #define ODP_VPORT_LIST          _IOWR('O', 10, struct odp_portvec)
 
-#define ODP_FLOW_GET            _IOWR('O', 13, struct odp_flow)
+#define ODP_FLOW_GET            _IOWR('O', 13, struct odp_flowvec)
 #define ODP_FLOW_PUT            _IOWR('O', 14, struct odp_flow)
 #define ODP_FLOW_LIST           _IOWR('O', 15, struct odp_flowvec)
 #define ODP_FLOW_FLUSH          _IO('O', 16)
-- 
1.7.1





More information about the dev mailing list