summaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-03-02 14:54:35 +0100
committerDavid S. Miller <davem@davemloft.net>2016-03-02 13:45:47 -0500
commitfb653ebddcf871e8a83a63c1e4e73d41bc3cf599 (patch)
tree18e7523e95704b9d4dccadb3b5ca799c681741c5 /net/batman-adv
parent7cb43bebab52d8a9aa5943fbd1babe633a255e2c (diff)
downloadblackbird-op-linux-fb653ebddcf871e8a83a63c1e4e73d41bc3cf599.tar.gz
blackbird-op-linux-fb653ebddcf871e8a83a63c1e4e73d41bc3cf599.zip
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 <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>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/Kconfig2
1 files changed, 1 insertions, 1 deletions
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
OpenPOWER on IntegriCloud