projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: Improve type-safety of OBJECT_CONTAINING.
[openvswitch]
/
include
/
openvswitch
/
datapath-protocol.h
diff --git
a/include/openvswitch/datapath-protocol.h
b/include/openvswitch/datapath-protocol.h
index 15c05e0d05b71a6d9ade01707b96a1e874af7c93..4885906449eee728494516308a6164db1aeee0ee 100644
(file)
--- a/
include/openvswitch/datapath-protocol.h
+++ b/
include/openvswitch/datapath-protocol.h
@@
-52,13
+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
#include "openvswitch/types.h"
#define ovs_be16 __be16
#define ovs_be32 __be32
#define ovs_be64 __be64
#else
#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)
@@
-365,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 {