diff options
| author | Stephen Hemminger <stephen@networkplumber.org> | 2020-06-23 10:07:52 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2020-06-23 10:07:52 -0700 |
| commit | bfa68419ea07ab0176575ffc8c54f4d48f48eda2 (patch) | |
| tree | aec2c9b606b7851ab0f65d51006a9188c72b81a2 | |
| parent | ee2cac068f05e2abc1427f7dd59d091cc58dd381 (diff) | |
| download | bridge-utils-bfa68419ea07ab0176575ffc8c54f4d48f48eda2.tar.gz | |
Replace references to enslave
The term enslave is not appropriate in this context.
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | brctl/brctl_cmd.c | 6 | ||||
| -rw-r--r-- | doc/HOWTO | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -10,7 +10,7 @@ Advantages of the new code are: - Each bridge is seen as a logical device, which allows you to do firewalling between port groups for example. - Everything is dynamic; bridges are created dynamically using the - userspace configuration tool, ports are 'enslaved' dynamically, etc. + userspace configuration tool, ports are added dynamically, etc. - It is being actively maintained. - It uses a hash table for MAC addresses, not an AVL tree. - It's small (currently 4 pages of i386 code) and modular. diff --git a/brctl/brctl_cmd.c b/brctl/brctl_cmd.c index acd66be..81f7dfa 100644 --- a/brctl/brctl_cmd.c +++ b/brctl/brctl_cmd.c @@ -104,13 +104,13 @@ static int br_cmd_addif(int argc, char *const* argv) case EBUSY: fprintf(stderr, "device %s is already a member of a bridge; " - "can't enslave it to bridge %s.\n", ifname, + "can't add it to bridge %s.\n", ifname, brname); break; case ELOOP: fprintf(stderr, "device %s is a bridge device itself; " - "can't enslave a bridge device to a bridge device.\n", + "can't add a bridge device to a bridge device.\n", ifname); break; @@ -146,7 +146,7 @@ static int br_cmd_delif(int argc, char *const* argv) break; case EINVAL: - fprintf(stderr, "device %s is not a slave of %s\n", + fprintf(stderr, "device %s is not a port of %s\n", ifname, brname); break; @@ -34,7 +34,7 @@ create an instance of the bridge first. # brctl addbr br0 (You can check that this gives you a network interface called br0.) -Now we want to enslave eth0 and eth1 to this bridge. +Now we want to add devices eth0 and eth1 to this bridge. # brctl addif br0 eth0 # brctl addif br0 eth1 |