All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Hemminger <stephen@networkplumber.org>
To: netdev@vger.kernel.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH iproute2 3/5] testsuite: replace Enslave with Insert
Date: Tue, 23 Jun 2020 16:53:05 -0700	[thread overview]
Message-ID: <20200623235307.9216-4-stephen@networkplumber.org> (raw)
In-Reply-To: <20200623235307.9216-1-stephen@networkplumber.org>

Use the term insert instead of enslave because it is
more descriptive and less offensive.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 testsuite/tests/bridge/vlan/show.t       | 4 ++--
 testsuite/tests/bridge/vlan/tunnelshow.t | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/testsuite/tests/bridge/vlan/show.t b/testsuite/tests/bridge/vlan/show.t
index 3def202226a4..1f0ac9a9870b 100755
--- a/testsuite/tests/bridge/vlan/show.t
+++ b/testsuite/tests/bridge/vlan/show.t
@@ -12,13 +12,13 @@ ts_ip "$0" "Add $BR_DEV bridge interface" link add $BR_DEV type bridge
 
 ts_ip "$0" "Add $VX0_DEV vxlan interface" \
 	link add $VX0_DEV type vxlan dstport 4789 external
-ts_ip "$0" "Enslave $VX0_DEV under $BR_DEV" \
+ts_ip "$0" "Insert $VX0_DEV under $BR_DEV" \
 	link set dev $VX0_DEV master $BR_DEV
 ts_bridge "$0" "Delete default vlan from $VX0_DEV" \
 	vlan del dev $VX0_DEV vid 1
 ts_ip "$0" "Add $VX1_DEV vxlan interface" \
 	link add $VX1_DEV type vxlan dstport 4790 external
-ts_ip "$0" "Enslave $VX1_DEV under $BR_DEV" \
+ts_ip "$0" "Insert $VX1_DEV under $BR_DEV" \
 	link set dev $VX1_DEV master $BR_DEV
 
 # Test that bridge ports without vlans do not appear in the output
diff --git a/testsuite/tests/bridge/vlan/tunnelshow.t b/testsuite/tests/bridge/vlan/tunnelshow.t
index 3e9c12a21a9c..2cec8d03b47a 100755
--- a/testsuite/tests/bridge/vlan/tunnelshow.t
+++ b/testsuite/tests/bridge/vlan/tunnelshow.t
@@ -11,7 +11,7 @@ ts_ip "$0" "Add $BR_DEV bridge interface" link add $BR_DEV type bridge
 
 ts_ip "$0" "Add $VX_DEV vxlan interface" \
 	link add $VX_DEV type vxlan dstport 4789 external
-ts_ip "$0" "Enslave $VX_DEV under $BR_DEV" \
+ts_ip "$0" "Insert $VX_DEV under $BR_DEV" \
 	link set dev $VX_DEV master $BR_DEV
 ts_ip "$0" "Set vlan_tunnel on $VX_DEV" \
 	link set dev $VX_DEV type bridge_slave vlan_tunnel on
-- 
2.26.2


  parent reply	other threads:[~2020-06-23 23:53 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-23 23:53 [PATCH iproute2 0/5] Eliminate the term slave in iproute2 Stephen Hemminger
2020-06-23 23:53 ` [PATCH iproute2 1/5] bpf: replace slave with sub Stephen Hemminger
2020-06-23 23:53 ` [PATCH iproute2 2/5] bridge: remove slave from comments and message Stephen Hemminger
2020-06-23 23:53 ` Stephen Hemminger [this message]
2020-06-23 23:53 ` [PATCH iproute2 4/5] ip: replace slave_kind Stephen Hemminger
2020-06-23 23:53 ` [PATCH iproute2 5/5] ip: rename slave to subport Stephen Hemminger
2020-06-24  0:12 ` [PATCH iproute2 0/5] Eliminate the term slave in iproute2 Jakub Kicinski
2020-06-24  9:51 ` Michal Kubecek
2020-06-24 15:21   ` Stephen Hemminger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200623235307.9216-4-stephen@networkplumber.org \
    --to=stephen@networkplumber.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.