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
lib/ofpbuf: Compact
[sliver-openvswitch.git]
/
lib
/
cfm.c
diff --git
a/lib/cfm.c
b/lib/cfm.c
index
48556cf
..
dcdaa0e
100644
(file)
--- a/
lib/cfm.c
+++ b/
lib/cfm.c
@@
-557,7
+557,7
@@
cfm_compose_ccm(struct cfm *cfm, struct ofpbuf *packet,
eth_push_vlan(packet, htons(ETH_TYPE_VLAN), htons(tci));
}
eth_push_vlan(packet, htons(ETH_TYPE_VLAN), htons(tci));
}
- ccm =
packet->l3
;
+ ccm =
ofpbuf_get_l3(packet)
;
ccm->mdlevel_version = 0;
ccm->opcode = CCM_OPCODE;
ccm->tlv_offset = 70;
ccm->mdlevel_version = 0;
ccm->opcode = CCM_OPCODE;
ccm->tlv_offset = 70;
@@
-719,7
+719,8
@@
cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf *p)
ovs_mutex_lock(&mutex);
eth = p->l2;
ovs_mutex_lock(&mutex);
eth = p->l2;
- ccm = ofpbuf_at(p, (uint8_t *)p->l3 - (uint8_t *)p->data, CCM_ACCEPT_LEN);
+ ccm = ofpbuf_at(p, (uint8_t *)ofpbuf_get_l3(p) - (uint8_t *)p->data,
+ CCM_ACCEPT_LEN);
if (!ccm) {
VLOG_INFO_RL(&rl, "%s: Received an unparseable 802.1ag CCM heartbeat.",
if (!ccm) {
VLOG_INFO_RL(&rl, "%s: Received an unparseable 802.1ag CCM heartbeat.",