2016-03-02 13:55:27

by Arnd Bergmann

[permalink] [raw]
Subject: [PATCH] batman-adv: clarify CFG80211 dependency

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 <[email protected]>
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(-)

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
--
2.7.0


2016-03-02 15:25:55

by Antonio Quartulli

[permalink] [raw]
Subject: Re: [PATCH] batman-adv: clarify CFG80211 dependency

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 <[email protected]>
> Fixes: c833484e5f38 ("batman-adv: ELP - compute the metric based on the estimated throughput")

Acked-by: Antonio Quartulli <[email protected]>

Thanks a lot Arnd!

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

Regards,

--
Antonio Quartulli

Attachments:
(No filename) (714.00 B)
 signature.asc (819.00 B)
Digital signature Download all attachments

2016-03-02 18:46:09

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] batman-adv: clarify CFG80211 dependency

From: Antonio Quartulli <[email protected]>
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 <[email protected]>
>> Fixes: c833484e5f38 ("batman-adv: ELP - compute the metric based on the estimated throughput")
>
> Acked-by: Antonio Quartulli <[email protected]>
>
> Thanks a lot Arnd!
>
> David, could you please merge this change in net-next directly ?

Done, applied, thanks everyone.