netdev.vger.kernel.org archive mirror
 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 1/5] bpf: replace slave with sub
Date: Tue, 23 Jun 2020 16:53:03 -0700	[thread overview]
Message-ID: <20200623235307.9216-2-stephen@networkplumber.org> (raw)
In-Reply-To: <20200623235307.9216-1-stephen@networkplumber.org>

The term sub interface is more appropriate for bpf devices.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 lib/bpf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/bpf.c b/lib/bpf.c
index c7d45077c14e..9271e169a992 100644
--- a/lib/bpf.c
+++ b/lib/bpf.c
@@ -666,7 +666,7 @@ static int bpf_gen_master(const char *base, const char *name)
 	return bpf_gen_global(bpf_sub_dir);
 }
 
-static int bpf_slave_via_bind_mnt(const char *full_name,
+static int bpf_sub_via_bind_mnt(const char *full_name,
 				  const char *full_link)
 {
 	int ret;
@@ -689,7 +689,7 @@ static int bpf_slave_via_bind_mnt(const char *full_name,
 	return ret;
 }
 
-static int bpf_gen_slave(const char *base, const char *name,
+static int bpf_gen_sub(const char *base, const char *name,
 			 const char *link)
 {
 	char bpf_lnk_dir[PATH_MAX + NAME_MAX + 1];
@@ -709,7 +709,7 @@ static int bpf_gen_slave(const char *base, const char *name,
 				return ret;
 			}
 
-			return bpf_slave_via_bind_mnt(bpf_sub_dir,
+			return bpf_sub_via_bind_mnt(bpf_sub_dir,
 						      bpf_lnk_dir);
 		}
 
@@ -733,7 +733,7 @@ static int bpf_gen_hierarchy(const char *base)
 
 	ret = bpf_gen_master(base, bpf_prog_to_subdir(__bpf_types[0]));
 	for (i = 1; i < ARRAY_SIZE(__bpf_types) && !ret; i++)
-		ret = bpf_gen_slave(base,
+		ret = bpf_gen_sub(base,
 				    bpf_prog_to_subdir(__bpf_types[i]),
 				    bpf_prog_to_subdir(__bpf_types[0]));
 	return ret;
-- 
2.26.2


  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 ` Stephen Hemminger [this message]
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 ` [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-2-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).