projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nicira-ext: Fix NXM example.
[openvswitch]
/
lib
/
ofp-util.h
diff --git
a/lib/ofp-util.h
b/lib/ofp-util.h
index 7938aa0c27a767a8911da9aeed79b692cb633419..a9601aa14c1795fbc7e70a1425fe7f5003dc0253 100644
(file)
--- a/
lib/ofp-util.h
+++ b/
lib/ofp-util.h
@@
-302,7
+302,9
@@
enum ofputil_action_code {
OFPUTIL_NXAST_SET_TUNNEL64,
OFPUTIL_NXAST_MULTIPATH,
OFPUTIL_NXAST_AUTOPATH,
OFPUTIL_NXAST_SET_TUNNEL64,
OFPUTIL_NXAST_MULTIPATH,
OFPUTIL_NXAST_AUTOPATH,
- OFPUTIL_NXAST_BUNDLE
+ OFPUTIL_NXAST_BUNDLE,
+ OFPUTIL_NXAST_BUNDLE_LOAD,
+ OFPUTIL_NXAST_RESUBMIT_TABLE
};
int ofputil_decode_action(const union ofp_action *);
};
int ofputil_decode_action(const union ofp_action *);
@@
-314,7
+316,8
@@
enum ofputil_action_code ofputil_decode_action_unsafe(
static inline union ofp_action *
ofputil_action_next(const union ofp_action *a)
{
static inline union ofp_action *
ofputil_action_next(const union ofp_action *a)
{
- return (void *) ((uint8_t *) a + ntohs(a->header.len));
+ return ((union ofp_action *) (void *)
+ ((uint8_t *) a + ntohs(a->header.len)));
}
static inline bool
}
static inline bool