[ovs-dev] [PATCH v4 0/2] Use more sensitive terminology.

Ben Pfaff blp at ovn.org
Sat Oct 17 04:35:14 UTC 2020


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(-)

-- 
2.26.2



More information about the dev mailing list