projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/citrix'
[openvswitch]
/
include
/
openvswitch
/
datapath-protocol.h
diff --git
a/include/openvswitch/datapath-protocol.h
b/include/openvswitch/datapath-protocol.h
index beaba32d8bd174aa28d1750568d1c189ad9f94b8..ae363827a46a183d82903461434fa9c6e35a4600 100644
(file)
--- a/
include/openvswitch/datapath-protocol.h
+++ b/
include/openvswitch/datapath-protocol.h
@@
-37,7
+37,7
@@
* ----------------------------------------------------------------------
*/
* ----------------------------------------------------------------------
*/
-/* Protocol between
secchan and
datapath. */
+/* Protocol between
userspace and kernel
datapath. */
#ifndef OPENVSWITCH_DATAPATH_PROTOCOL_H
#define OPENVSWITCH_DATAPATH_PROTOCOL_H 1
#ifndef OPENVSWITCH_DATAPATH_PROTOCOL_H
#define OPENVSWITCH_DATAPATH_PROTOCOL_H 1
@@
-70,14
+70,12
@@
#define ODP_PORT_GROUP_GET _IOWR('O', 12, struct odp_port_group)
#define ODP_FLOW_GET _IOWR('O', 13, struct odp_flow)
#define ODP_PORT_GROUP_GET _IOWR('O', 12, struct odp_port_group)
#define ODP_FLOW_GET _IOWR('O', 13, struct odp_flow)
-#define ODP_FLOW_
GET_MULTIPLE _IOWR('O', 14, 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_LIST _IOWR('O', 15, struct odp_flowvec)
-
#define ODP_FLOW_FLUSH _IO('O', 16)
#define ODP_FLOW_FLUSH _IO('O', 16)
-#define ODP_FLOW_PUT _IOWR('O', 17, struct odp_flow)
-#define ODP_FLOW_DEL _IOWR('O', 18, struct odp_flow)
+#define ODP_FLOW_DEL _IOWR('O', 17, struct odp_flow)
-#define ODP_EXECUTE _IOR('O', 1
9
, struct odp_execute)
+#define ODP_EXECUTE _IOR('O', 1
8
, struct odp_execute)
struct odp_stats {
/* Flows. */
struct odp_stats {
/* Flows. */
@@
-149,7
+147,7
@@
struct odp_flow_stats {
__u32 used_nsec;
__u8 tcp_flags;
__u8 ip_tos;
__u32 used_nsec;
__u8 tcp_flags;
__u8 ip_tos;
- __u16
reserved;
+ __u16
error; /* Used by ODP_FLOW_GET. */
};
struct odp_flow_key {
};
struct odp_flow_key {