projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Change ofproto_add_flow(), ofproto_delete_flow() to take cls_rule.
[openvswitch]
/
include
/
openvswitch
/
datapath-protocol.h
diff --git
a/include/openvswitch/datapath-protocol.h
b/include/openvswitch/datapath-protocol.h
index 0cadc824bf38671b9a680f01832e6b87a86f201f..15c05e0d05b71a6d9ade01707b96a1e874af7c93 100644
(file)
--- a/
include/openvswitch/datapath-protocol.h
+++ b/
include/openvswitch/datapath-protocol.h
@@
-56,10
+56,7
@@
#define ovs_be32 __be32
#define ovs_be64 __be64
#else
#define ovs_be32 __be32
#define ovs_be64 __be64
#else
-#include <stdint.h>
-#define ovs_be16 uint16_t
-#define ovs_be32 uint32_t
-#define ovs_be64 uint64_t
+#include "openvswitch/types.h"
#endif
#define ODP_MAX 256 /* Maximum number of datapaths. */
#endif
#define ODP_MAX 256 /* Maximum number of datapaths. */
@@
-226,7
+223,6
@@
struct odp_flow_key {
uint8_t nw_proto; /* IP protocol or lower 8 bits of
ARP opcode. */
uint8_t nw_tos; /* IP ToS (DSCP field, 6 bits). */
uint8_t nw_proto; /* IP protocol or lower 8 bits of
ARP opcode. */
uint8_t nw_tos; /* IP ToS (DSCP field, 6 bits). */
- uint32_t reserved[1]; /* Reserved for later use. */
};
/* Flags for ODP_FLOW. */
};
/* Flags for ODP_FLOW. */
@@
-259,7
+255,7
@@
struct odp_flowvec {
/* Action types. */
#define ODPAT_OUTPUT 0 /* Output to switch port. */
#define ODPAT_CONTROLLER 2 /* Send copy to controller. */
/* Action types. */
#define ODPAT_OUTPUT 0 /* Output to switch port. */
#define ODPAT_CONTROLLER 2 /* Send copy to controller. */
-#define ODPAT_SET_DL_TCI 3 /* Set the 802.1q
VLAN VID and/or PCP
. */
+#define ODPAT_SET_DL_TCI 3 /* Set the 802.1q
TCI value
. */
#define ODPAT_STRIP_VLAN 5 /* Strip the 802.1q header. */
#define ODPAT_SET_DL_SRC 6 /* Ethernet source address. */
#define ODPAT_SET_DL_DST 7 /* Ethernet destination address. */
#define ODPAT_STRIP_VLAN 5 /* Strip the 802.1q header. */
#define ODPAT_SET_DL_SRC 6 /* Ethernet source address. */
#define ODPAT_SET_DL_DST 7 /* Ethernet destination address. */
@@
-296,10
+292,8
@@
struct odp_action_tunnel {
/* Action structure for ODPAT_SET_DL_TCI. */
struct odp_action_dl_tci {
uint16_t type; /* ODPAT_SET_DL_TCI. */
/* Action structure for ODPAT_SET_DL_TCI. */
struct odp_action_dl_tci {
uint16_t type; /* ODPAT_SET_DL_TCI. */
- ovs_be16 tci; /* New TCI. Bits not in mask must be zero. */
- ovs_be16 mask; /* 0x0fff to set VID, 0xe000 to set PCP,
- * or 0xefff to set both. */
- uint16_t reserved;
+ ovs_be16 tci; /* New TCI. CFI bit must be zero. */
+ uint32_t reserved;
};
/* Action structure for ODPAT_SET_DL_SRC/DST. */
};
/* Action structure for ODPAT_SET_DL_SRC/DST. */