From f51cf36d86e4a51630dc2781034149c13a634d67 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 17 Jun 2020 15:31:09 -0700 Subject: conntrack: Rename "master" connection to "parent" connection. Signed-off-by: Ben Pfaff Acked-by: Alin Gabriel Serdean --- lib/netlink-conntrack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/netlink-conntrack.c') 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; } -- cgit v1.2.1