* [B.A.T.M.A.N.] [PATCH] batman-adv: Allow selecting BATMAN V if CFG80211 is not built
@ 2016-09-20 13:59 Linus Lüssing
2016-09-20 15:51 ` Sven Eckelmann
2016-10-18 11:31 ` [B.A.T.M.A.N.] " Sven Eckelmann
0 siblings, 2 replies; 3+ messages in thread
From: Linus Lüssing @ 2016-09-20 13:59 UTC (permalink / raw)
To: b.a.t.m.a.n
With the new stub for cfg80211_get_station(), we can now build the
BATMAN V protocol even with a kernel that was built without any
wireless support.
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
---
compat-include/net/cfg80211.h | 24 ++++++++++++++++++++++++
net/batman-adv/Kconfig | 2 +-
2 files changed, 25 insertions(+), 1 deletion(-)
create mode 100644 compat-include/net/cfg80211.h
diff --git a/compat-include/net/cfg80211.h b/compat-include/net/cfg80211.h
new file mode 100644
index 0000000..8dbbf0e
--- /dev/null
+++ b/compat-include/net/cfg80211.h
@@ -0,0 +1,24 @@
+#ifndef _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_
+#define _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_
+
+#include <linux/version.h>
+#include_next <net/cfg80211.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
+
+#if !IS_ENABLED(CONFIG_CFG80211)
+
+#define cfg80211_get_station(dev, mac_addr, sinfo) \
+ batadv_cfg80211_get_station(dev, mac_addr, sinfo)
+
+static inline int batadv_cfg80211_get_station(struct net_device *dev,
+ const u8 *mac_addr,
+ struct station_info *sinfo)
+{
+ return -ENOENT;
+}
+#endif
+
+#endif /* < KERNEL_VERSION(4, 8, 0) */
+
+#endif /* _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ */
diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index f20742c..b73b96a 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=y || (CFG80211=m && BATMAN_ADV=m)
+ depends on BATMAN_ADV && !(CFG80211=m && BATMAN_ADV=y)
default n
help
This option enables the B.A.T.M.A.N. V protocol, the successor
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Allow selecting BATMAN V if CFG80211 is not built
2016-09-20 13:59 [B.A.T.M.A.N.] [PATCH] batman-adv: Allow selecting BATMAN V if CFG80211 is not built Linus Lüssing
@ 2016-09-20 15:51 ` Sven Eckelmann
2016-10-18 11:31 ` [B.A.T.M.A.N.] " Sven Eckelmann
1 sibling, 0 replies; 3+ messages in thread
From: Sven Eckelmann @ 2016-09-20 15:51 UTC (permalink / raw)
To: b.a.t.m.a.n
[-- Attachment #1: Type: text/plain, Size: 416 bytes --]
On Dienstag, 20. September 2016 15:59:17 CEST Linus Lüssing wrote:
> With the new stub for cfg80211_get_station(), we can now build the
> BATMAN V protocol even with a kernel that was built without any
> wireless support.
>
> Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
> ---
Haven't tested it yet but it looks good.
Reviewed-by: Sven Eckelmann <sven@narfation.org>
Kind regards,
Sven
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [B.A.T.M.A.N.] batman-adv: Allow selecting BATMAN V if CFG80211 is not built
2016-09-20 13:59 [B.A.T.M.A.N.] [PATCH] batman-adv: Allow selecting BATMAN V if CFG80211 is not built Linus Lüssing
2016-09-20 15:51 ` Sven Eckelmann
@ 2016-10-18 11:31 ` Sven Eckelmann
1 sibling, 0 replies; 3+ messages in thread
From: Sven Eckelmann @ 2016-10-18 11:31 UTC (permalink / raw)
To: Linus Lüssing; +Cc: b.a.t.m.a.n
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
On Dienstag, 20. September 2016 15:59:17 CEST Linus Lüssing wrote:
> With the new stub for cfg80211_get_station(), we can now build the
> BATMAN V protocol even with a kernel that was built without any
> wireless support.
>
> Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
> Reviewed-by: Sven Eckelmann <sven@narfation.org>
> ---
> compat-include/net/cfg80211.h | 24 ++++++++++++++++++++++++
> net/batman-adv/Kconfig | 2 +-
> 2 files changed, 25 insertions(+), 1 deletion(-)
> create mode 100644 compat-include/net/cfg80211.h
Applied in aeb194c3a45fef9cc094e3509066bb2fa6627c05 [1].
Kind regards,
Sven
[1] https://git.open-mesh.org/batman-adv.git/commit/aeb194c3a45fef9cc094e3509066bb2fa6627c05
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-18 11:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-20 13:59 [B.A.T.M.A.N.] [PATCH] batman-adv: Allow selecting BATMAN V if CFG80211 is not built Linus Lüssing
2016-09-20 15:51 ` Sven Eckelmann
2016-10-18 11:31 ` [B.A.T.M.A.N.] " Sven Eckelmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).