projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bridge: Improve name and comments for bond_entry's "iface_tag" member.
[openvswitch]
/
lib
/
classifier.c
diff --git
a/lib/classifier.c
b/lib/classifier.c
index fcc965c873aa7679533b022ad1c67840ec9a42b2..71d26e9a2fc6c321e8e01ec4a40ae9755e6ba709 100644
(file)
--- a/
lib/classifier.c
+++ b/
lib/classifier.c
@@
-526,6
+526,8
@@
cls_rule_format(const struct cls_rule *rule, struct ds *s)
ds_put_format(s, "dl_vlan_pcp=%d,",
vlan_tci_to_pcp(f->vlan_tci));
}
ds_put_format(s, "dl_vlan_pcp=%d,",
vlan_tci_to_pcp(f->vlan_tci));
}
+ } else if (wc->vlan_tci_mask == htons(0xffff)) {
+ ds_put_format(s, "vlan_tci=0x%04"PRIx16",", ntohs(f->vlan_tci));
} else {
ds_put_format(s, "vlan_tci=0x%04"PRIx16"/0x%04"PRIx16",",
ntohs(f->vlan_tci), ntohs(wc->vlan_tci_mask));
} else {
ds_put_format(s, "vlan_tci=0x%04"PRIx16"/0x%04"PRIx16",",
ntohs(f->vlan_tci), ntohs(wc->vlan_tci_mask));