Skip to contentSkip to conversation

net: sysctl: remove redundant #ifdef CONFIG_NET

PATCH Applied Masahiro Yamada 2 participants 2 messages Jan 25, 2021 – Jan 28, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: sysctl: remove redundant #ifdef CONFIG_NET

CONFIG_NET is a bool option, and this file is compiled only when CONFIG_NET=y.

Remove #ifdef CONFIG_NET, which we know it is always met.

---

 net/core/sysctl_net_core.c | 2 --
 1 file changed, 2 deletions(-)
net/core/sysctl_net_core.c +0 -2
index d86d8d11cfe4..4567de519603 100644
@@ -309,7 +309,6 @@ proc_dolongvec_minmax_bpf_restricted(struct ctl_table *table, int write,
 #endif
 
 static struct ctl_table net_core_table[] = {
-#ifdef CONFIG_NET
 	{
 		.procname	= "wmem_max",
 		.data		= &sysctl_wmem_max,
@@ -507,7 +506,6 @@ static struct ctl_table net_core_table[] = {
 		.proc_handler	= set_default_qdisc
 	},
 #endif
-#endif /* CONFIG_NET */
 	{
 		.procname	= "netdev_budget",
 		.data		= &netdev_budget,
Signature · 1 line
2.27.0
#1 lore raw
This patch was applied to netdev/net-next.git (refs/heads/master):

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

Quoted 8 lines · On Tue, 26 Jan 2021 08:14:21 +0900 you wrote:

CONFIG_NET is a bool option, and this file is compiled only when CONFIG_NET=y.

Remove #ifdef CONFIG_NET, which we know it is always met.

[...]

Here is the summary with links:
- net: sysctl: remove redundant #ifdef CONFIG_NET

    https://git.kernel.org/netdev/net-next/c/69783429cd13

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html