projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement stress option framework.
[openvswitch]
/
include
/
openvswitch
/
datapath-protocol.h
diff --git
a/include/openvswitch/datapath-protocol.h
b/include/openvswitch/datapath-protocol.h
index 1aa8066cade4487a054abd885bf25540d31e8182..4885906449eee728494516308a6164db1aeee0ee 100644
(file)
--- a/
include/openvswitch/datapath-protocol.h
+++ b/
include/openvswitch/datapath-protocol.h
@@
-52,16
+52,17
@@
* those types when compiling the kernel. */
#ifdef __KERNEL__
#include <linux/types.h>
* those types when compiling the kernel. */
#ifdef __KERNEL__
#include <linux/types.h>
+#include <linux/socket.h>
#define ovs_be16 __be16
#define ovs_be32 __be32
#define ovs_be64 __be64
#else
#define ovs_be16 __be16
#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"
+#include <sys/socket.h>
#endif
#endif
+#include <linux/if_link.h>
+
#define ODP_MAX 256 /* Maximum number of datapaths. */
#define ODP_DP_CREATE _IO('O', 0)
#define ODP_MAX 256 /* Maximum number of datapaths. */
#define ODP_DP_CREATE _IO('O', 0)
@@
-258,7
+259,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. */
@@
-295,10
+296,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. */
@@
-370,24
+369,9
@@
struct odp_vport_mod {
void *config;
};
void *config;
};
-struct odp_vport_stats {
- uint64_t rx_packets;
- uint64_t tx_packets;
- uint64_t rx_bytes;
- uint64_t tx_bytes;
- uint64_t rx_dropped;
- uint64_t tx_dropped;
- uint64_t rx_errors;
- uint64_t tx_errors;
- uint64_t rx_frame_err;
- uint64_t rx_over_err;
- uint64_t rx_crc_err;
- uint64_t collisions;
-};
-
struct odp_vport_stats_req {
char devname[16]; /* IFNAMSIZ */
struct odp_vport_stats_req {
char devname[16]; /* IFNAMSIZ */
- struct
odp_vport_stats
stats;
+ struct
rtnl_link_stats64
stats;
};
struct odp_vport_ether {
};
struct odp_vport_ether {