From patchwork Sat Oct 17 04:35:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 1383607 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CCqw64cj9z9sTm for ; Sat, 17 Oct 2020 15:36:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AD2E388E97; Sat, 17 Oct 2020 04:36:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EdxAIQKm6iLq; Sat, 17 Oct 2020 04:36:02 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id E73A388E60; Sat, 17 Oct 2020 04:36:02 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id DA8A4C07FF; Sat, 17 Oct 2020 04:36:02 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id E13B5C0051 for ; Sat, 17 Oct 2020 04:36:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CD4CF88494 for ; Sat, 17 Oct 2020 04:36:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id V6f9DmXF61RT for ; Sat, 17 Oct 2020 04:36:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by hemlock.osuosl.org (Postfix) with ESMTPS id 818CE8848F for ; Sat, 17 Oct 2020 04:36:00 +0000 (UTC) Received: from sigfpe.attlocal.net (75-54-222-30.lightspeed.rdcyca.sbcglobal.net [75.54.222.30]) (Authenticated sender: blp@ovn.org) by relay11.mail.gandi.net (Postfix) with ESMTPSA id E4B3A100003; Sat, 17 Oct 2020 04:35:55 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Fri, 16 Oct 2020 21:35:14 -0700 Message-Id: <20201017043515.2695557-1-blp@ovn.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH v4 0/2] Use more sensitive terminology. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" There's no value in risking turning people away from OVS due to insensitive terminology choices. We can do better. v1->v2: Rebase. v2->v3: Fix some new instances of "slave" that had crept in (thanks Ilya!). Drop a patch that I had accidentally appended in v2. v3->v4: Apply two of the patches that had been reviewed by Alin. Update the other two patches based on suggestions: "primary" connection becomes "parent", "sub-interfaces" become "members" (also suggested by Alin). Ben Pfaff (2): conntrack: Rename "master" connection to "parent" connection. Eliminate use of term "slave" in bond, LACP, and bundle contexts. Documentation/topics/bonding.rst | 167 +++--- Documentation/topics/porting.rst | 4 +- NEWS | 4 +- debian/changelog | 2 +- debian/ifupdown.sh | 4 +- include/openvswitch/meta-flow.h | 14 +- include/openvswitch/ofp-actions.h | 28 +- lib/bundle.c | 101 ++-- lib/bundle.h | 4 +- lib/cfm.c | 4 +- lib/conntrack-private.h | 10 +- lib/conntrack.c | 74 +-- lib/ct-dpif.c | 6 +- lib/ct-dpif.h | 2 +- lib/dpif-netdev.c | 42 +- lib/dpif-provider.h | 4 +- lib/dpif.c | 4 +- lib/dpif.h | 2 +- lib/lacp.c | 547 +++++++++---------- lib/lacp.h | 25 +- lib/lldp/lldp-const.h | 16 +- lib/lldp/lldpd-structs.h | 10 +- lib/mac-learning.c | 4 +- lib/mac-learning.h | 2 +- lib/meta-flow.xml | 2 +- lib/netdev-linux.c | 22 +- lib/netlink-conntrack.c | 6 +- lib/ofp-actions.c | 108 ++-- lib/ovs-actions.xml | 35 +- lib/rtnetlink.c | 16 +- lib/rtnetlink.h | 6 +- lib/unixctl.c | 6 +- ofproto/bond.c | 839 +++++++++++++++--------------- ofproto/bond.h | 29 +- ofproto/ofproto-dpif-rid.h | 4 +- ofproto/ofproto-dpif-sflow.c | 2 +- ofproto/ofproto-dpif-xlate.c | 22 +- ofproto/ofproto-dpif.c | 47 +- ofproto/ofproto-dpif.h | 2 +- ofproto/ofproto-provider.h | 12 +- ofproto/ofproto.c | 7 +- ofproto/ofproto.h | 11 +- tests/bundle.at | 48 +- tests/lacp.at | 146 +++--- tests/ofp-actions.at | 28 +- tests/ofproto-dpif.at | 106 ++-- tests/ofproto.at | 4 +- tests/ovs-ofctl.at | 56 +- tests/system-traffic.at | 6 +- tests/test-bundle.c | 112 ++-- vswitchd/bridge.c | 35 +- vswitchd/ovs-vswitchd.8.in | 42 +- vswitchd/vswitch.xml | 37 +- 53 files changed, 1457 insertions(+), 1419 deletions(-)