batman-adv: clarify CFG80211 dependency
authorArnd Bergmann <arnd@arndb.de>
Wed, 2 Mar 2016 13:54:35 +0000 (14:54 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Mar 2016 18:45:47 +0000 (13:45 -0500)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/batman-adv/Kconfig

index e651dc927bfd0beeae26c167217400b370ea168f..f66930ee3c0b06a753c41bf70cafc0e14de330a5 100644 (file)
@@ -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