diff options
author | Ben Pfaff <blp@ovn.org> | 2017-06-23 16:47:54 +0000 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2017-06-27 17:28:29 -0400 |
commit | be7ac2f3c105866542de5c1d4c7e2651250a3e92 (patch) | |
tree | e9b1337df24c062900b96611f5836b558b9dde00 /lib/tun-metadata.c | |
parent | 07e73e085f1d124230fc97883eb01dd8f37f0d78 (diff) | |
download | openvswitch-be7ac2f3c105866542de5c1d4c7e2651250a3e92.tar.gz |
nx-match: Add context argument to nxm_put__().
An upcoming commit will need to pass an extra piece of data from
nx_put_raw() into all of its direct and indirect calls to nxm_put__().
This commit prepares for that by switching from a "struct ofpbuf *"
parameter to a context structure that, currently, contains just a
struct ofpbuf *. The upcoming commit will add another member to the
context struct.
This commit has no visible effect on behavior.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'lib/tun-metadata.c')
-rw-r--r-- | lib/tun-metadata.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tun-metadata.c b/lib/tun-metadata.c index 08858f114..2fbd9b67e 100644 --- a/lib/tun-metadata.c +++ b/lib/tun-metadata.c @@ -875,8 +875,8 @@ tun_metadata_to_nx_match(struct ofpbuf *b, enum ofp_version oxm, loc); memcpy_from_metadata(mask_opts.tun_metadata, &match->wc.masks.tunnel.metadata, loc); - nxm_put__(b, MFF_TUN_METADATA0 + i, oxm, opts.tun_metadata, - is_masked ? mask_opts.tun_metadata : NULL, loc->len); + nxm_put_entry_raw(b, MFF_TUN_METADATA0 + i, oxm, opts.tun_metadata, + is_masked ? mask_opts.tun_metadata : NULL, loc->len); } } |