Message ID | 20210802035600.29799-1-yajun.deng@linux.dev (mailing list archive) |
---|---|
State | Rejected |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] net: ipv4/ipv6: rename procfs dentry | expand |
Context | Check | Description |
---|---|---|
netdev/cover_letter | success | Link |
netdev/fixes_present | success | Link |
netdev/patch_count | success | Link |
netdev/tree_selection | success | Clearly marked for net-next |
netdev/subject_prefix | success | Link |
netdev/cc_maintainers | warning | 6 maintainers not CCed: yang.lee@linux.alibaba.com trix@redhat.com jdike@akamai.com chinagar@codeaurora.org zhutong@amazon.com weichen.chen@linux.alibaba.com |
netdev/source_inline | success | Was 0 now: 0 |
netdev/verify_signedoff | success | Link |
netdev/module_param | success | Was 0 now: 0 |
netdev/build_32bit | success | Errors and warnings before: 3 this patch: 3 |
netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
netdev/verify_fixes | success | Link |
netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 32 lines checked |
netdev/build_allmodconfig_warn | success | Errors and warnings before: 3 this patch: 3 |
netdev/header_inline | success | Link |
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 53e85c70c6e5..e831b9adf1e4 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -3648,7 +3648,7 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p, sizeof(t->neigh_vars[NEIGH_VAR_GC_INTERVAL])); } else { struct neigh_table *tbl = p->tbl; - dev_name_source = "default"; + dev_name_source = "current"; t->neigh_vars[NEIGH_VAR_GC_INTERVAL].data = &tbl->gc_interval; t->neigh_vars[NEIGH_VAR_GC_THRESH1].data = &tbl->gc_thresh1; t->neigh_vars[NEIGH_VAR_GC_THRESH2].data = &tbl->gc_thresh2; diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index c82aded8da7d..b716c5d1c821 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -2696,7 +2696,7 @@ static __net_init int devinet_init_net(struct net *net) if (err < 0) goto err_reg_all; - err = __devinet_sysctl_register(net, "default", + err = __devinet_sysctl_register(net, "current", NETCONFA_IFINDEX_DEFAULT, dflt); if (err < 0) goto err_reg_dflt; diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index db0a89810f28..614fe500f308 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -7002,7 +7002,7 @@ static int __addrconf_sysctl_register(struct net *net, char *dev_name, if (!strcmp(dev_name, "all")) ifindex = NETCONFA_IFINDEX_ALL; - else if (!strcmp(dev_name, "default")) + else if (!strcmp(dev_name, "current")) ifindex = NETCONFA_IFINDEX_DEFAULT; else ifindex = idev->dev->ifindex; @@ -7112,7 +7112,7 @@ static int __net_init addrconf_init_net(struct net *net) if (err < 0) goto err_reg_all; - err = __addrconf_sysctl_register(net, "default", NULL, dflt); + err = __addrconf_sysctl_register(net, "current", NULL, dflt); if (err < 0) goto err_reg_dflt; #endif
The "default" name just represents the initial value, anyone can modify it in user. It is more appropriate to use "current" name. Signed-off-by: Yajun Deng <yajun.deng@linux.dev> --- net/core/neighbour.c | 2 +- net/ipv4/devinet.c | 2 +- net/ipv6/addrconf.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)