projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-print: Slightly extend ofp_print_bit_names().
[openvswitch]
/
include
/
openflow
/
openflow-1.0.h
diff --git
a/include/openflow/openflow-1.0.h
b/include/openflow/openflow-1.0.h
index 039eb6beae94c0b599eefab1af293e0603d2a8ac..d71b007e809610af0cd61f28e553eff43802226e 100644
(file)
--- a/
include/openflow/openflow-1.0.h
+++ b/
include/openflow/openflow-1.0.h
@@
-240,11
+240,6
@@
struct ofp10_action_output {
};
OFP_ASSERT(sizeof(struct ofp10_action_output) == 8);
};
OFP_ASSERT(sizeof(struct ofp10_action_output) == 8);
-/* The VLAN id is 12 bits, so we can use the entire 16 bits to indicate
- * special conditions. All ones is used to match that no VLAN id was
- * set. */
-#define OFP_VLAN_NONE 0xffff
-
/* Action header for OFPAT10_VENDOR. The rest of the body is vendor-defined. */
struct ofp_action_vendor_header {
ovs_be16 type; /* OFPAT10_VENDOR. */
/* Action header for OFPAT10_VENDOR. The rest of the body is vendor-defined. */
struct ofp_action_vendor_header {
ovs_be16 type; /* OFPAT10_VENDOR. */
@@
-369,7
+364,7
@@
enum ofp_flow_wildcards {
/* The VLAN id is 12-bits, so we can use the entire 16 bits to indicate
* special conditions. All ones indicates that no VLAN id was set.
*/
/* The VLAN id is 12-bits, so we can use the entire 16 bits to indicate
* special conditions. All ones indicates that no VLAN id was set.
*/
-#define OFP_VLAN_NONE 0xffff
+#define OFP
10
_VLAN_NONE 0xffff
/* Fields to match against flows */
struct ofp10_match {
/* Fields to match against flows */
struct ofp10_match {