projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Change listing ports to use an iterator concept.
[openvswitch]
/
include
/
openflow
/
openflow.h
diff --git
a/include/openflow/openflow.h
b/include/openflow/openflow.h
index f84fd0202e245160e71a9f9ce29817539f3ffc89..5f1dd609f2002d8c4a1a8b97c200f24c776df009 100644
(file)
--- a/
include/openflow/openflow.h
+++ b/
include/openflow/openflow.h
@@
-19,11
+19,7
@@
#ifndef OPENFLOW_OPENFLOW_H
#define OPENFLOW_OPENFLOW_H 1
#ifndef OPENFLOW_OPENFLOW_H
#define OPENFLOW_OPENFLOW_H 1
-#ifdef __KERNEL__
-#include <linux/types.h>
-#else
#include <stdint.h>
#include <stdint.h>
-#endif
#ifdef SWIG
#define OFP_ASSERT(EXPR) /* SWIG can't handle OFP_ASSERT. */
#ifdef SWIG
#define OFP_ASSERT(EXPR) /* SWIG can't handle OFP_ASSERT. */
@@
-216,7
+212,7
@@
enum ofp_port_features {
struct ofp_phy_port {
uint16_t port_no;
uint8_t hw_addr[OFP_ETH_ALEN];
struct ofp_phy_port {
uint16_t port_no;
uint8_t hw_addr[OFP_ETH_ALEN];
-
uint8_t
name[OFP_MAX_PORT_NAME_LEN]; /* Null-terminated */
+
char
name[OFP_MAX_PORT_NAME_LEN]; /* Null-terminated */
uint32_t config; /* Bitmap of OFPPC_* flags. */
uint32_t state; /* Bitmap of OFPPS_* flags. */
uint32_t config; /* Bitmap of OFPPC_* flags. */
uint32_t state; /* Bitmap of OFPPS_* flags. */