batman-adv: Depend on CFG80211 for BATMAN_V

Message ID 1456248335-20169-1-git-send-email-sven@narfation.org (mailing list archive)
State Accepted, archived
Commit 2e0a2972e35402540002a0d142fb92b4f0bebb55
Delegated to: Marek Lindner
Headers

Commit Message

Sven Eckelmann Feb. 23, 2016, 5:25 p.m. UTC
  The B.A.T.M.A.N. V metric can uses cfg80211_get_station to calculate the
expected throughput for ieee80211 devices. This function only exists when
the kernel was compile with CONFIG_CFG80211 and thus the
BATMAN_ADV_BATMAN_V option has to depend on it.

Fixes: 5c3245172c01 ("batman-adv: ELP - compute the metric based on the estimated throughput")
Reported-by: Antonio Quartulli <antonio.quartulli@open-mesh.com>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
@Antonio: Please squash this with 0b0214420ad2 ("batman-adv: ELP - compute
the metric based on the estimated throughput")

 net/batman-adv/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Marek Lindner Feb. 24, 2016, 3:54 p.m. UTC | #1
On Tuesday, February 23, 2016 18:25:35 Sven Eckelmann wrote:
> The B.A.T.M.A.N. V metric can uses cfg80211_get_station to calculate the
> expected throughput for ieee80211 devices. This function only exists when
> the kernel was compile with CONFIG_CFG80211 and thus the
> BATMAN_ADV_BATMAN_V option has to depend on it.
> 
> Fixes: 5c3245172c01 ("batman-adv: ELP - compute the metric based on the
> estimated throughput") Reported-by: Antonio Quartulli
> <antonio.quartulli@open-mesh.com>
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> ---
> @Antonio: Please squash this with 0b0214420ad2 ("batman-adv: ELP - compute
> the metric based on the estimated throughput")
> 
>  net/batman-adv/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied in revision 2e0a297.

Thanks,
Marek
  

Patch

diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index 5c148a8..e651dc9 100644
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -17,7 +17,7 @@  config BATMAN_ADV
 
 config BATMAN_ADV_BATMAN_V
 	bool "B.A.T.M.A.N. V protocol (experimental)"
-	depends on BATMAN_ADV
+	depends on BATMAN_ADV && CFG80211
 	default n
 	help
 	  This option enables the B.A.T.M.A.N. V protocol, the successor