projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "sflow" into "master".
[openvswitch]
/
include
/
openflow
/
openflow.h
diff --git
a/include/openflow/openflow.h
b/include/openflow/openflow.h
index 1d70aab95d34956d03c8469e8d3e526773fa9fee..1f1837071327d154e0578ead5d05f39f698cdce5 100644
(file)
--- a/
include/openflow/openflow.h
+++ b/
include/openflow/openflow.h
@@
-351,7
+351,7
@@
struct ofp_action_vlan_pcp {
uint8_t vlan_pcp; /* VLAN priority. */
uint8_t pad[3];
};
uint8_t vlan_pcp; /* VLAN priority. */
uint8_t pad[3];
};
-OFP_ASSERT(sizeof(struct ofp_action_vlan_
vid
) == 8);
+OFP_ASSERT(sizeof(struct ofp_action_vlan_
pcp
) == 8);
/* Action structure for OFPAT_SET_DL_SRC/DST. */
struct ofp_action_dl_addr {
/* Action structure for OFPAT_SET_DL_SRC/DST. */
struct ofp_action_dl_addr {