net: remove redundant 'depends on NET'

masahir0y · kuba-moo · commit 864e898ba3f6 · 2021-01-27T17:04:12.000-08:00
These Kconfig files are included from net/Kconfig, inside the if NET ... endif. Remove 'depends on NET', which we know it is already met. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Link: https://lore.kernel.org/r/20210125232026.106855-1-masahiroy@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/net/9p/Kconfig b/net/9p/Kconfig
@@ -4,7 +4,6 @@
 #
 
 menuconfig NET_9P
-	depends on NET
 	tristate "Plan 9 Resource Sharing Support (9P2000)"
 	help
 	  If you say Y here, you will get experimental support for
diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
@@ -9,7 +9,6 @@
 
 config BATMAN_ADV
 	tristate "B.A.T.M.A.N. Advanced Meshing Protocol"
-	depends on NET
 	select LIBCRC32C
 	help
 	  B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
@@ -5,7 +5,7 @@
 
 menuconfig BT
 	tristate "Bluetooth subsystem support"
-	depends on NET && !S390
+	depends on !S390
 	depends on RFKILL || !RFKILL
 	select CRC16
 	select CRYPTO
diff --git a/net/bpfilter/Kconfig b/net/bpfilter/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 menuconfig BPFILTER
 	bool "BPF based packet filtering framework (BPFILTER)"
-	depends on NET && BPF && INET
+	depends on BPF && INET
 	select USERMODE_DRIVER
 	help
 	  This builds experimental bpfilter framework that is aiming to
diff --git a/net/can/Kconfig b/net/can/Kconfig
@@ -4,7 +4,6 @@
 #
 
 menuconfig CAN
-	depends on NET
 	tristate "CAN bus subsystem support"
 	help
 	  Controller Area Network (CAN) is a slow (up to 1Mbit/s) serial
diff --git a/net/dns_resolver/Kconfig b/net/dns_resolver/Kconfig
@@ -4,7 +4,7 @@
 #
 config DNS_RESOLVER
 	tristate "DNS Resolver support"
-	depends on NET && KEYS
+	depends on KEYS
 	help
 	  Saying Y here will include support for the DNS Resolver key type
 	  which can be used to make upcalls to perform DNS lookups in
diff --git a/net/ife/Kconfig b/net/ife/Kconfig
@@ -4,7 +4,6 @@
 #
 
 menuconfig NET_IFE
-	depends on NET
 	tristate "Inter-FE based on IETF ForCES InterFE LFB"
 	default n
 	help
diff --git a/net/llc/Kconfig b/net/llc/Kconfig
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config LLC
 	tristate
-	depends on NET
 
 config LLC2
 	tristate "ANSI/IEEE 802.2 LLC type 2 Support"
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 menu "Core Netfilter Configuration"
-	depends on NET && INET && NETFILTER
+	depends on INET && NETFILTER
 
 config NETFILTER_INGRESS
 	bool "Netfilter ingress support"
diff --git a/net/netfilter/ipvs/Kconfig b/net/netfilter/ipvs/Kconfig
@@ -4,7 +4,7 @@
 #
 menuconfig IP_VS
 	tristate "IP virtual server support"
-	depends on NET && INET && NETFILTER
+	depends on INET && NETFILTER
 	depends on (NF_CONNTRACK || NF_CONNTRACK=n)
 	help
 	  IP Virtual Server support will let you build a high-performance
diff --git a/net/nfc/Kconfig b/net/nfc/Kconfig
@@ -4,7 +4,6 @@
 #
 
 menuconfig NFC
-	depends on NET
 	depends on RFKILL || !RFKILL
 	tristate "NFC subsystem support"
 	default n
diff --git a/net/psample/Kconfig b/net/psample/Kconfig
@@ -4,7 +4,6 @@
 #
 
 menuconfig PSAMPLE
-	depends on NET
 	tristate "Packet-sampling netlink channel"
 	default n
 	help

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`#`
`5`	`5`
`6`	`6`	`menuconfig NET_9P`
`7`		`- depends on NET`
`8`	`7`	`tristate "Plan 9 Resource Sharing Support (9P2000)"`
`9`	`8`	`help`
`10`	`9`	`If you say Y here, you will get experimental support for`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`#`
`5`	`5`
`6`	`6`	`menuconfig CAN`
`7`		`- depends on NET`
`8`	`7`	`tristate "CAN bus subsystem support"`
`9`	`8`	`help`
`10`	`9`	`Controller Area Network (CAN) is a slow (up to 1Mbit/s) serial`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`config DNS_RESOLVER`
`6`	`6`	`tristate "DNS Resolver support"`
`7`		`- depends on NET && KEYS`
	`7`	`+ depends on KEYS`
`8`	`8`	`help`
`9`	`9`	`Saying Y here will include support for the DNS Resolver key type`
`10`	`10`	`which can be used to make upcalls to perform DNS lookups in`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`#`
`5`	`5`
`6`	`6`	`menuconfig NET_IFE`
`7`		`- depends on NET`
`8`	`7`	`tristate "Inter-FE based on IETF ForCES InterFE LFB"`
`9`	`8`	`default n`
`10`	`9`	`help`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`menuconfig IP_VS`
`6`	`6`	`tristate "IP virtual server support"`
`7`		`- depends on NET && INET && NETFILTER`
	`7`	`+ depends on INET && NETFILTER`
`8`	`8`	`depends on (NF_CONNTRACK \|\| NF_CONNTRACK=n)`
`9`	`9`	`help`
`10`	`10`	`IP Virtual Server support will let you build a high-performance`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`#`
`5`	`5`
`6`	`6`	`menuconfig NFC`
`7`		`- depends on NET`
`8`	`7`	`depends on RFKILL \|\| !RFKILL`
`9`	`8`	`tristate "NFC subsystem support"`
`10`	`9`	`default n`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`#`
`5`	`5`
`6`	`6`	`menuconfig PSAMPLE`
`7`		`- depends on NET`
`8`	`7`	`tristate "Packet-sampling netlink channel"`
`9`	`8`	`default n`
`10`	`9`	`help`