projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nicira-ext: Clarify comments about 'src' and 'dst' in NXAST_REG actions.
[openvswitch]
/
lib
/
ofp-parse.c
diff --git
a/lib/ofp-parse.c
b/lib/ofp-parse.c
index 1ec0a00ee0a915039aa525591e301a91dc51e7c5..490c9dff37a8294d1fba96d207ef92024e4d3e3f 100644
(file)
--- a/
lib/ofp-parse.c
+++ b/
lib/ofp-parse.c
@@
-383,8
+383,8
@@
parse_protocol(const char *name, const struct protocol **p_out)
#define FIELDS \
FIELD(F_IN_PORT, "in_port", FWW_IN_PORT) \
#define FIELDS \
FIELD(F_IN_PORT, "in_port", FWW_IN_PORT) \
- FIELD(F_DL_VLAN, "dl_vlan",
FWW_DL_VLAN)
\
- FIELD(F_DL_VLAN_PCP, "dl_vlan_pcp",
FWW_DL_VLAN_PCP)
\
+ FIELD(F_DL_VLAN, "dl_vlan",
0)
\
+ FIELD(F_DL_VLAN_PCP, "dl_vlan_pcp",
0)
\
FIELD(F_DL_SRC, "dl_src", FWW_DL_SRC) \
FIELD(F_DL_DST, "dl_dst", FWW_DL_DST) \
FIELD(F_DL_TYPE, "dl_type", FWW_DL_TYPE) \
FIELD(F_DL_SRC, "dl_src", FWW_DL_SRC) \
FIELD(F_DL_DST, "dl_dst", FWW_DL_DST) \
FIELD(F_DL_TYPE, "dl_type", FWW_DL_TYPE) \
@@
-580,6
+580,10
@@
parse_ofp_str(struct parsed_flow *pf, struct ofpbuf *actions, char *string)
cls_rule_set_nw_src_masked(&pf->rule, 0, 0);
} else if (f->index == F_NW_DST) {
cls_rule_set_nw_dst_masked(&pf->rule, 0, 0);
cls_rule_set_nw_src_masked(&pf->rule, 0, 0);
} else if (f->index == F_NW_DST) {
cls_rule_set_nw_dst_masked(&pf->rule, 0, 0);
+ } else if (f->index == F_DL_VLAN) {
+ cls_rule_set_any_vid(&pf->rule);
+ } else if (f->index == F_DL_VLAN_PCP) {
+ cls_rule_set_any_pcp(&pf->rule);
} else {
NOT_REACHED();
}
} else {
NOT_REACHED();
}