diff options
author | Ben Pfaff <blp@ovn.org> | 2018-03-19 13:11:26 -0700 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2018-03-31 11:31:36 -0700 |
commit | 1f7270d737c7fc1b2cd49bc34048198f0201201b (patch) | |
tree | 741f123b426eb9c7b19296aebaaf35ccfedce4bf /include | |
parent | 3829cad68a7e68760046a4903d60c0a4ee9b65c2 (diff) | |
download | openvswitch-1f7270d737c7fc1b2cd49bc34048198f0201201b.tar.gz |
match: Add 'tun_md' member to struct minimatch.
struct match has had a 'tun_md' member for a long time, but struct
minimatch has never had one. This doesn't matter for the purposes for
which minimatch is currently used, but it means that a minimatch is not
completely substitutable for a match and therefore blocks some new uses.
This patch adds the member.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com>
Reviewed-by: Armando Migliaccio <armamig@gmail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/openvswitch/match.h | 1 | ||||
-rw-r--r-- | include/openvswitch/tun-metadata.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/openvswitch/match.h b/include/openvswitch/match.h index 61a67de2c..e5cf1a0d7 100644 --- a/include/openvswitch/match.h +++ b/include/openvswitch/match.h @@ -242,6 +242,7 @@ struct minimatch { }; struct miniflow *flows[2]; }; + struct tun_metadata_allocation *tun_md; }; void minimatch_init(struct minimatch *, const struct match *); diff --git a/include/openvswitch/tun-metadata.h b/include/openvswitch/tun-metadata.h index 935c5c495..dc0312ecb 100644 --- a/include/openvswitch/tun-metadata.h +++ b/include/openvswitch/tun-metadata.h @@ -101,6 +101,11 @@ struct tun_metadata_allocation { bool valid; /* Set to true after any allocation occurs. */ }; +struct tun_metadata_allocation *tun_metadata_allocation_clone( + const struct tun_metadata_allocation *); +void tun_metadata_allocation_copy(struct tun_metadata_allocation *, + const struct tun_metadata_allocation *); + #ifdef __cplusplus } #endif |