Skip to contentSkip to conversation

fix IP_FIB_HASH kconfig warning

PATCH In review Adrian Bunk 2 participants 3 messages Jul 3, 2005 – Jul 9, 2005

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

PATCH 1/1 fix IP_FIB_HASH kconfig warning

[ This time with a subject... ]

This patch fixes the following kconfig warning:
net/ipv4/Kconfig:92:warning: defaults for choice values not supported

---

I've Cc'ed Roman because I might have missed a more elegant solution.

net/ipv4/Kconfig renamed from net/ipv4/Kconfig.old +3 -5
@@ -58,8 +58,9 @@
 	depends on IP_ADVANCED_ROUTER
 	default IP_FIB_HASH
 
-config IP_FIB_HASH
+config ASK_IP_FIB_HASH
 	bool "FIB_HASH"
+	select IP_FIB_HASH
 	---help---
 	Current FIB is very proven and good enough for most users.
 
@@ -84,12 +85,9 @@
        
 endchoice
 
-# If the user does not enable advanced routing, he gets the safe
-# default of the fib-hash algorithm.
 config IP_FIB_HASH
 	bool
-	depends on !IP_ADVANCED_ROUTER
-	default y
+	default y if !IP_ADVANCED_ROUTER
 
 config IP_MULTIPLE_TABLES
 	bool "IP: policy routing"
#1 lore raw

Hi,

Quoted 17 lines · Adrian Bunk
net/ipv4/Kconfig renamed from net/ipv4/Kconfig.old +2 -1
@@ -58,8 +58,9 @@
 	depends on IP_ADVANCED_ROUTER
 	default IP_FIB_HASH
 
-config IP_FIB_HASH
+config ASK_IP_FIB_HASH
 	bool "FIB_HASH"
+	select IP_FIB_HASH
 	---help---
 	Current FIB is very proven and good enough for most users.
 
@@ -84,12 +85,9 @@
 
 endchoice
 

net/ipv4/Kconfig line 93

Quoted 10 lines
net/ipv4/Kconfig renamed from net/ipv4/Kconfig.old +1 -4
-# If the user does not enable advanced routing, he gets the safe
-# default of the fib-hash algorithm.
 config IP_FIB_HASH
 	bool
-	depends on !IP_ADVANCED_ROUTER
-	default y
+	default y if !IP_ADVANCED_ROUTER
 
 config IP_MULTIPLE_TABLES
 	bool "IP: policy routing"

I'd prefer to do it without select.

config IP_FIB_HASH

	def_bool ASK_IP_FIB_HASH || !IP_ADVANCED_ROUTER

bye, Roman

#2 lore raw

PATCH 1/1 fix IP_FIB_HASH kconfig warning

Quoted 3 lines · Roman Zippel

...
config IP_FIB_HASH

	def_bool ASK_IP_FIB_HASH || !IP_ADVANCED_ROUTER

An updated patch is below.

Quoted 1 line

bye, Roman

cu
Adrian

<-- snip -->

This patch fixes the following kconfig warning:
net/ipv4/Kconfig:92:warning: defaults for choice values not supported

net/ipv4/Kconfig renamed from net/ipv4/Kconfig.old +3 -7
@@ -56,9 +56,9 @@
 choice 
 	prompt "Choose IP: FIB lookup algorithm (choose FIB_HASH if unsure)"
 	depends on IP_ADVANCED_ROUTER
-	default IP_FIB_HASH
+	default ASK_IP_FIB_HASH
 
-config IP_FIB_HASH
+config ASK_IP_FIB_HASH
 	bool "FIB_HASH"
 	---help---
 	Current FIB is very proven and good enough for most users.
@@ -84,12 +84,8 @@
        
 endchoice
 
-# If the user does not enable advanced routing, he gets the safe
-# default of the fib-hash algorithm.
 config IP_FIB_HASH
-	bool
-	depends on !IP_ADVANCED_ROUTER
-	default y
+	def_bool ASK_IP_FIB_HASH || !IP_ADVANCED_ROUTER
 
 config IP_MULTIPLE_TABLES
 	bool "IP: policy routing"