diff mbox

batman-adv: clarify CFG80211 dependency

Message ID 1456926882-2941809-1-git-send-email-arnd@arndb.de (mailing list archive)
State Accepted, archived
Commit 4735b462b1d09caa0d12d8460186a4e552c43a85
Delegated to: Marek Lindner
Headers

Commit Message

Arnd Bergmann March 2, 2016, 1:54 p.m. UTC 
  The driver calls cfg80211_get_station, which may be part of a
module, so we must not enable BATMAN_ADV_BATMAN_V if
BATMAN_ADV=y and CFG80211=m:

net/built-in.o: In function `batadv_v_elp_get_throughput':
(text+0x5c62c): undefined reference to `cfg80211_get_station'

This clarifies the dependency to cover all combinations.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: c833484e5f38 ("batman-adv: ELP - compute the metric based on the estimated throughput")
---
 net/batman-adv/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Antonio Quartulli March 2, 2016, 2:46 p.m. UTC | #1 
On Wed, Mar 02, 2016 at 02:54:35PM +0100, Arnd Bergmann wrote:
> The driver calls cfg80211_get_station, which may be part of a
> module, so we must not enable BATMAN_ADV_BATMAN_V if
> BATMAN_ADV=y and CFG80211=m:
> 
> net/built-in.o: In function `batadv_v_elp_get_throughput':
> (text+0x5c62c): undefined reference to `cfg80211_get_station'
> 
> This clarifies the dependency to cover all combinations.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: c833484e5f38 ("batman-adv: ELP - compute the metric based on the estimated throughput")

Acked-by: Antonio Quartulli <a@unstable.cc>

Thanks a lot Arnd!

David, could you please merge this change in net-next directly ?

Regards,
David Miller March 2, 2016, 6:46 p.m. UTC | #2 
From: Antonio Quartulli <a@unstable.cc>
Date: Wed, 2 Mar 2016 22:46:07 +0800

> On Wed, Mar 02, 2016 at 02:54:35PM +0100, Arnd Bergmann wrote:
>> The driver calls cfg80211_get_station, which may be part of a
>> module, so we must not enable BATMAN_ADV_BATMAN_V if
>> BATMAN_ADV=y and CFG80211=m:
>> 
>> net/built-in.o: In function `batadv_v_elp_get_throughput':
>> (text+0x5c62c): undefined reference to `cfg80211_get_station'
>> 
>> This clarifies the dependency to cover all combinations.
>> 
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> Fixes: c833484e5f38 ("batman-adv: ELP - compute the metric based on the estimated throughput")
> 
> Acked-by: Antonio Quartulli <a@unstable.cc>
> 
> Thanks a lot Arnd!
> 
> David, could you please merge this change in net-next directly ?

Done, applied, thanks everyone.
diff mbox

Patch

diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index e651dc927bfd..f66930ee3c0b 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 && CFG80211
+	depends on BATMAN_ADV && CFG80211=y || (CFG80211=m && BATMAN_ADV=m)
 	default n
 	help
 	  This option enables the B.A.T.M.A.N. V protocol, the successor