projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-print: Avoid converting flow to ofp_match just to format it.
[openvswitch]
/
lib
/
odp-util.c
diff --git
a/lib/odp-util.c
b/lib/odp-util.c
index 511ec3a99f8b403273d0b7a25cebb4817f862c1b..e57a7cb090204a1cf86707d76136af7fe4915fa7 100644
(file)
--- a/
lib/odp-util.c
+++ b/
lib/odp-util.c
@@
-42,7
+42,8
@@
odp_actions_add(struct odp_actions *actions, uint16_t type)
void
format_odp_flow_key(struct ds *ds, const struct odp_flow_key *key)
{
void
format_odp_flow_key(struct ds *ds, const struct odp_flow_key *key)
{
- ds_put_format(ds, "in_port%04x tci(", key->in_port);
+ ds_put_format(ds, "tun_id0x%08x in_port%d tci(",
+ key->tun_id, key->in_port);
if (key->dl_tci) {
ds_put_format(ds, "vlan%"PRIu16",pcp%d",
vlan_tci_to_vid(key->dl_tci),
if (key->dl_tci) {
ds_put_format(ds, "vlan%"PRIu16",pcp%d",
vlan_tci_to_vid(key->dl_tci),
@@
-186,6
+187,7
@@
odp_flow_key_from_flow(struct odp_flow_key *key, const struct flow *flow)
void
odp_flow_key_to_flow(const struct odp_flow_key *key, struct flow *flow)
{
void
odp_flow_key_to_flow(const struct odp_flow_key *key, struct flow *flow)
{
+ memset(flow->regs, 0, sizeof flow->regs);
flow->tun_id = key->tun_id;
flow->nw_src = key->nw_src;
flow->nw_dst = key->nw_dst;
flow->tun_id = key->tun_id;
flow->nw_src = key->nw_src;
flow->nw_dst = key->nw_dst;