projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Update flow context for resubmit on VLAN actions
[openvswitch]
/
lib
/
odp-util.c
diff --git
a/lib/odp-util.c
b/lib/odp-util.c
index 16a40ded3cb39ff5dc2d1e2825cd6e610146a4a6..130d55de77f2d99930cb76afd1d3cf5d544878d2 100644
(file)
--- a/
lib/odp-util.c
+++ b/
lib/odp-util.c
@@
-75,7
+75,6
@@
format_odp_action(struct ds *ds, const union odp_action *a)
int vid = vlan_tci_to_vid(a->dl_tci.tci);
int pcp = vlan_tci_to_pcp(a->dl_tci.tci);
int vid = vlan_tci_to_vid(a->dl_tci.tci);
int pcp = vlan_tci_to_pcp(a->dl_tci.tci);
- ds_put_cstr(ds, "set_tci(");
switch (ntohs(a->dl_tci.mask)) {
case VLAN_VID_MASK:
ds_put_format(ds, "set_tci(vlan=%d)", vid);
switch (ntohs(a->dl_tci.mask)) {
case VLAN_VID_MASK:
ds_put_format(ds, "set_tci(vlan=%d)", vid);
@@
-198,7
+197,6
@@
odp_flow_key_from_flow(struct odp_flow_key *key, const struct flow *flow)
memcpy(key->dl_dst, flow->dl_dst, ETH_ADDR_LEN);
key->nw_proto = flow->nw_proto;
key->nw_tos = flow->nw_tos;
memcpy(key->dl_dst, flow->dl_dst, ETH_ADDR_LEN);
key->nw_proto = flow->nw_proto;
key->nw_tos = flow->nw_tos;
- memset(key->reserved, 0, sizeof key->reserved);
}
void
}
void