From: Ben Pfaff Date: Thu, 23 Dec 2010 17:36:19 +0000 (-0800) Subject: datapath: Correct argument size for ODP_FLOW_GET. X-Git-Tag: v1.1.0~593 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=57b7c6a143a7b86f753ec1928aae3a74b95befd4;p=sliver-openvswitch.git datapath: Correct argument size for ODP_FLOW_GET. 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 Acked-by: Jesse Gross --- diff --git a/datapath/odp-compat.h b/datapath/odp-compat.h index 7ae5df695..b03539aa7 100644 --- a/datapath/odp-compat.h +++ b/datapath/odp-compat.h @@ -16,7 +16,7 @@ #include #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 db135c896..b8f93de6f 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)