diff options
| author | Jesse Gross <jesse@kernel.org> | 2016-06-09 13:32:50 -0700 |
|---|---|---|
| committer | Jesse Gross <jesse@kernel.org> | 2016-06-13 13:28:39 -0700 |
| commit | 098d2a9777f0d986220d278c0095eae42eaadf21 (patch) | |
| tree | c7096584ef1bd8daaedcc51d960c9c1e01dabed9 /lib/tnl-ports.c | |
| parent | d1d7816bec0ddc005e99df8d39c8c280ce8b4115 (diff) | |
| download | openvswitch-098d2a9777f0d986220d278c0095eae42eaadf21.tar.gz | |
odp-util: Remove odp_in_port from struct odp_flow_key_parms.
When calling odp_flow_key_from_flow (or _mask), the in_port included
as part of the flow is ignored and must be explicitly passed as a
separate parameter. This is because the assumption was that the flow's
version would often be in OFP format, rather than ODP.
However, at this point all flows that are ready for serialization in
netlink format already have their in_port properly set to ODP format.
As a result, every caller needs to explicitly initialize the extra
paramter to the value that is in the flow. This switches to just use
the value in the flow to simply things and avoid the possibility of
forgetting to initialize the extra parameter.
Signed-off-by: Jesse Gross <jesse@kernel.org>
Acked-by: Daniele Di Proietto <diproiettod@vmware.com>
Diffstat (limited to 'lib/tnl-ports.c')
| -rw-r--r-- | lib/tnl-ports.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/tnl-ports.c b/lib/tnl-ports.c index e8d43f0f1..e945eae24 100644 --- a/lib/tnl-ports.c +++ b/lib/tnl-ports.c @@ -316,7 +316,6 @@ tnl_port_show_v(struct ds *ds) miniflow_expand(p->cr.match.flow, &flow); /* Key. */ - odp_parms.odp_in_port = flow.in_port.odp_port; odp_parms.support.recirc = true; ofpbuf_use_stack(&buf, &keybuf, sizeof keybuf); odp_flow_key_from_flow(&odp_parms, &buf); @@ -324,7 +323,6 @@ tnl_port_show_v(struct ds *ds) key_len = buf.size; /* mask*/ - odp_parms.odp_in_port = wc.masks.in_port.odp_port; odp_parms.support.recirc = false; ofpbuf_use_stack(&buf, &maskbuf, sizeof maskbuf); odp_flow_key_from_mask(&odp_parms, &buf); |