diff options
| author | Ben Pfaff <blp@ovn.org> | 2020-06-17 15:31:09 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2020-10-21 11:24:15 -0700 |
| commit | f51cf36d86e4a51630dc2781034149c13a634d67 (patch) | |
| tree | 9d9a6e02170ecc57b662e3434b8a121c03f767cd /lib/netlink-conntrack.c | |
| parent | e39897fe9e4349ae29047a87505f65a295eac3df (diff) | |
| download | openvswitch-f51cf36d86e4a51630dc2781034149c13a634d67.tar.gz | |
conntrack: Rename "master" connection to "parent" connection.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Diffstat (limited to 'lib/netlink-conntrack.c')
| -rw-r--r-- | lib/netlink-conntrack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/netlink-conntrack.c b/lib/netlink-conntrack.c index 86ab866cf..78f1bf60b 100644 --- a/lib/netlink-conntrack.c +++ b/lib/netlink-conntrack.c @@ -237,7 +237,7 @@ nl_ct_flush(void) ofpbuf_uninit(&buf); /* Expectations are flushed automatically, because they do not - * have a master connection anymore */ + * have a parent connection anymore */ return err; } @@ -344,7 +344,7 @@ nl_ct_flush_zone(uint16_t flush_zone) ofpbuf_uninit(&buf); /* Expectations are flushed automatically, because they do not - * have a master connection anymore */ + * have a parent connection anymore */ return 0; } #endif @@ -1263,7 +1263,7 @@ nl_ct_attrs_to_ct_dpif_entry(struct ct_dpif_entry *entry, return false; } if (attrs[CTA_TUPLE_MASTER] && - !nl_ct_parse_tuple(attrs[CTA_TUPLE_MASTER], &entry->tuple_master, + !nl_ct_parse_tuple(attrs[CTA_TUPLE_MASTER], &entry->tuple_parent, nfgen_family)) { return false; } |