From: Stephen Hemminger <stephen@networkplumber.org>
To: netdev@vger.kernel.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH iproute2 4/5] ip: replace slave_kind
Date: Tue, 23 Jun 2020 16:53:06 -0700 [thread overview]
Message-ID: <20200623235307.9216-5-stephen@networkplumber.org> (raw)
In-Reply-To: <20200623235307.9216-1-stephen@networkplumber.org>
Instead of slave_kind, rename variable to sub_kind
to describe the kind of sub-device that is being looked for
when filtering messages.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
ip/ip_common.h | 2 +-
ip/ipaddress.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ip/ip_common.h b/ip/ip_common.h
index d604f7554405..7d0c9f57745a 100644
--- a/ip/ip_common.h
+++ b/ip/ip_common.h
@@ -23,7 +23,7 @@ struct link_filter {
int group;
int master;
char *kind;
- char *slave_kind;
+ char *sub_kind;
int target_nsid;
};
diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index f97eaff3dbbf..4cbff38c9834 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -924,7 +924,7 @@ int print_linkinfo(struct nlmsghdr *n, void *arg)
if (filter.kind && match_link_kind(tb, filter.kind, 0))
return -1;
- if (filter.slave_kind && match_link_kind(tb, filter.slave_kind, 1))
+ if (filter.sub_kind && match_link_kind(tb, filter.sub_kind, 1))
return -1;
if (n->nlmsg_type == RTM_DELLINK)
@@ -2012,7 +2012,7 @@ static int ipaddr_list_flush_or_save(int argc, char **argv, int action)
soff = strlen(*argv) - strlen("_slave");
if (!strcmp(*argv + soff, "_slave")) {
(*argv)[soff] = '\0';
- filter.slave_kind = *argv;
+ filter.sub_kind = *argv;
} else {
filter.kind = *argv;
}
--
2.26.2
next prev 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 ` [PATCH iproute2 3/5] testsuite: replace Enslave with Insert Stephen Hemminger
2020-06-23 23:53 ` Stephen Hemminger [this message]
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-5-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).