projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-util: Add version bitmap support to hello messages.
[openvswitch]
/
lib
/
nx-match.c
diff --git
a/lib/nx-match.c
b/lib/nx-match.c
index 4254747dfef73b1f63f8a4776b7fb922945c6eef..9c4088f1a65e86e404594aa3b07621c62c9c8c4b 100644
(file)
--- a/
lib/nx-match.c
+++ b/
lib/nx-match.c
@@
-626,7
+626,8
@@
nx_put_raw(struct ofpbuf *b, bool oxm, const struct match *match,
flow->arp_tha, match->wc.masks.arp_tha);
}
}
flow->arp_tha, match->wc.masks.arp_tha);
}
}
- } else if (flow->dl_type == htons(ETH_TYPE_ARP)) {
+ } else if (flow->dl_type == htons(ETH_TYPE_ARP) ||
+ flow->dl_type == htons(ETH_TYPE_RARP)) {
/* ARP. */
if (match->wc.masks.nw_proto) {
nxm_put_16(b, oxm ? OXM_OF_ARP_OP : NXM_OF_ARP_OP,
/* ARP. */
if (match->wc.masks.nw_proto) {
nxm_put_16(b, oxm ? OXM_OF_ARP_OP : NXM_OF_ARP_OP,
@@
-643,7
+644,8
@@
nx_put_raw(struct ofpbuf *b, bool oxm, const struct match *match,
}
/* Tunnel ID. */
}
/* Tunnel ID. */
- nxm_put_64m(b, NXM_NX_TUN_ID, flow->tun_id, match->wc.masks.tun_id);
+ nxm_put_64m(b, NXM_NX_TUN_ID, flow->tunnel.tun_id,
+ match->wc.masks.tunnel.tun_id);
/* Registers. */
for (i = 0; i < FLOW_N_REGS; i++) {
/* Registers. */
for (i = 0; i < FLOW_N_REGS; i++) {