projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Remove daemon tests that have been skipped forever.
[openvswitch]
/
lib
/
dpif-linux.h
diff --git
a/lib/dpif-linux.h
b/lib/dpif-linux.h
index 6526fb77aa2552cd5b4745d982107aaf93a1efd8..c9150b0d6e21a59ac0177546d2e8001ccc5d3fa9 100644
(file)
--- a/
lib/dpif-linux.h
+++ b/
lib/dpif-linux.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2010, 2011 Nicira
Networks
.
+ * Copyright (c) 2010, 2011 Nicira
, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-18,8
+18,9
@@
#define DPIF_LINUX_H 1
#include <stdbool.h>
#define DPIF_LINUX_H 1
#include <stdbool.h>
+#include <stddef.h>
#include <stdint.h>
#include <stdint.h>
-#include
"openvswitch/datapath-protocol.h"
+#include
<linux/openvswitch.h>
struct ofpbuf;
struct ofpbuf;
@@
-32,15
+33,17
@@
struct dpif_linux_vport {
uint32_t port_no; /* UINT32_MAX if unknown. */
enum ovs_vport_type type;
uint32_t port_no; /* UINT32_MAX if unknown. */
enum ovs_vport_type type;
- /* Attributes. */
+ /* Attributes.
+ *
+ * The 'stats' member points to 64-bit data that might only be aligned on
+ * 32-bit boundaries, so use get_unaligned_u64() to access its values.
+ */
const char *name; /* OVS_VPORT_ATTR_NAME. */
const char *name; /* OVS_VPORT_ATTR_NAME. */
- const struct rtnl_link_stats64 *stats; /* OVS_VPORT_ATTR_STATS. */
+ const uint32_t *upcall_pid; /* OVS_VPORT_ATTR_UPCALL_PID. */
+ const struct ovs_vport_stats *stats; /* OVS_VPORT_ATTR_STATS. */
const uint8_t *address; /* OVS_VPORT_ATTR_ADDRESS. */
const uint8_t *address; /* OVS_VPORT_ATTR_ADDRESS. */
- int mtu; /* OVS_VPORT_ATTR_MTU. */
const struct nlattr *options; /* OVS_VPORT_ATTR_OPTIONS. */
size_t options_len;
const struct nlattr *options; /* OVS_VPORT_ATTR_OPTIONS. */
size_t options_len;
- int ifindex; /* OVS_VPORT_ATTR_IFINDEX. */
- int iflink; /* OVS_VPORT_ATTR_IFLINK. */
};
void dpif_linux_vport_init(struct dpif_linux_vport *);
};
void dpif_linux_vport_init(struct dpif_linux_vport *);