git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
cfm.c
diff --git
a/lib/cfm.c
b/lib/cfm.c
index
bd2f6ea
..
583df1d
100644
(file)
--- a/
lib/cfm.c
+++ b/
lib/cfm.c
@@
-554,7
+554,7
@@
cfm_compose_ccm(struct cfm *cfm, struct ofpbuf *packet,
if (ccm_vlan || cfm->ccm_pcp) {
uint16_t tci = ccm_vlan | (cfm->ccm_pcp << VLAN_PCP_SHIFT);
- eth_push_vlan(packet, htons(tci));
+ eth_push_vlan(packet, htons(
ETH_TYPE_VLAN), htons(
tci));
}
ccm = packet->l3;