summaryrefslogtreecommitdiff
path: root/lib/cfm.c
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2014-01-15 17:17:01 +0900
committerBen Pfaff <blp@nicira.com>2014-01-16 14:38:21 -0800
commit1bf02876a46e3e86a59f959fdac57db7f6b0a4ad (patch)
tree4fb0cb9e71f0d6a7483c82a0c293b77b46373a3a /lib/cfm.c
parentbfd3367b9e7426ffc931c9b0d010d8b1b5884ec2 (diff)
downloadopenvswitch-1bf02876a46e3e86a59f959fdac57db7f6b0a4ad.tar.gz
lib: Add tpid parameter to eth_push_vlan()
This is in preparation for pushing vlan tags using the TPID provided by the kernel via auxdata. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/cfm.c')
-rw-r--r--lib/cfm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cfm.c b/lib/cfm.c
index bd2f6ea19..583df1ded 100644
--- 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;