[PATCH] batman-adv: Disable CONFIG_BATMAN_ADV_SYSFS by default
by Sven Eckelmann
The sysfs support in batman-adv is deprecated since a while and will be
removed completely next year.
All tools which were known to the batman-adv development team are
supporting the batman-adv netlink interface since a while. Thus
disabling CONFIG_BATMAN_ADV_SYSFS by default should not cause problems on
most systems. It is still possible to enable it in case it is still
required in a specific setup.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
---
Makefile | 2 +-
README.external.rst | 2 +-
net/batman-adv/Kconfig | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index e391a1e7..448a14d6 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ export CONFIG_BATMAN_ADV_NC=n
# B.A.T.M.A.N. multicast optimizations:
export CONFIG_BATMAN_ADV_MCAST=y
# B.A.T.M.A.N. sysfs support:
-export CONFIG_BATMAN_ADV_SYSFS=y
+export CONFIG_BATMAN_ADV_SYSFS=n
# B.A.T.M.A.N. tracing support:
export CONFIG_BATMAN_ADV_TRACING=n
# B.A.T.M.A.N. V routing algorithm (experimental):
diff --git a/README.external.rst b/README.external.rst
index 6db0117d..5a5da14e 100644
--- a/README.external.rst
+++ b/README.external.rst
@@ -49,7 +49,7 @@ module). Available options and their possible values are
* ``CONFIG_BATMAN_ADV_DAT=[y*|n]`` (B.A.T.M.A.N. Distributed ARP Table)
* ``CONFIG_BATMAN_ADV_MCAST=[y*|n]`` (B.A.T.M.A.N. multicast optimizations)
* ``CONFIG_BATMAN_ADV_NC=[y|n*]`` (B.A.T.M.A.N. Network Coding)
- * ``CONFIG_BATMAN_ADV_SYSFS=[y*|n]`` (B.A.T.M.A.N. sysfs support)
+ * ``CONFIG_BATMAN_ADV_SYSFS=[y|n*]`` (B.A.T.M.A.N. sysfs support)
* ``CONFIG_BATMAN_ADV_TRACING=[y|n*]`` (B.A.T.M.A.N. tracing support)
* ``CONFIG_BATMAN_ADV_BATMAN_V=[y*|n]`` (B.A.T.M.A.N. V routing algorithm)
diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index 045b2b18..c762758a 100644
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -100,7 +100,6 @@ config BATMAN_ADV_DEBUG
config BATMAN_ADV_SYSFS
bool "batman-adv sysfs entries"
depends on BATMAN_ADV
- default y
help
Say Y here if you want to enable batman-adv device configuration and
status interface through sysfs attributes. It is replaced by the
--
2.20.1
3 years, 1 month
[PATCH 1/3] alfred: Update copyright years for 2020
by Sven Eckelmann
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
---
Makefile | 2 +-
alfred.h | 2 +-
batadv_query.c | 2 +-
batadv_query.h | 2 +-
batadv_querynl.c | 2 +-
batadv_querynl.h | 2 +-
batman_adv.h | 2 +-
bitops.h | 2 +-
client.c | 2 +-
gpsd/Makefile | 2 +-
gpsd/alfred-gpsd.c | 2 +-
gpsd/alfred-gpsd.h | 2 +-
hash.c | 2 +-
hash.h | 2 +-
main.c | 2 +-
netlink.c | 2 +-
netlink.h | 2 +-
netsock.c | 2 +-
packet.h | 2 +-
recv.c | 2 +-
send.c | 2 +-
server.c | 2 +-
unix_sock.c | 2 +-
util.c | 2 +-
vis/Makefile | 2 +-
vis/vis.c | 2 +-
vis/vis.h | 2 +-
27 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Makefile b/Makefile
index 8840961..2bfe18c 100755
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: GPL-2.0
# -*- makefile -*-
#
-# Copyright (C) 2012-2019 B.A.T.M.A.N. contributors
+# Copyright (C) 2012-2020 B.A.T.M.A.N. contributors
#
# License-Filename: LICENSES/preferred/GPL-2.0
diff --git a/alfred.h b/alfred.h
index 2b7e175..38cc27b 100644
--- a/alfred.h
+++ b/alfred.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/batadv_query.c b/batadv_query.c
index fb72e77..f758b42 100644
--- a/batadv_query.c
+++ b/batadv_query.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/batadv_query.h b/batadv_query.h
index 7e93791..291292d 100644
--- a/batadv_query.h
+++ b/batadv_query.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2006-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
*
diff --git a/batadv_querynl.c b/batadv_querynl.c
index d5e9402..2793242 100644
--- a/batadv_querynl.c
+++ b/batadv_querynl.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch>
*
diff --git a/batadv_querynl.h b/batadv_querynl.h
index e2066c2..f684ad8 100644
--- a/batadv_querynl.h
+++ b/batadv_querynl.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch>
*
diff --git a/batman_adv.h b/batman_adv.h
index 67f4636..617c180 100644
--- a/batman_adv.h
+++ b/batman_adv.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: MIT */
-/* Copyright (C) 2016-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2016-2020 B.A.T.M.A.N. contributors:
*
* Matthias Schiffer
*/
diff --git a/bitops.h b/bitops.h
index ead4a4f..2333aa4 100644
--- a/bitops.h
+++ b/bitops.h
@@ -2,7 +2,7 @@
/* Minimal Linux-like bit manipulation helper functions
* (reduced version for alfred)
*
- * Copyright (c) 2012-2019, Sven Eckelmann <sven(a)narfation.org>
+ * Copyright (c) 2012-2020, Sven Eckelmann <sven(a)narfation.org>
*
* License-Filename: LICENSES/preferred/MIT
*/
diff --git a/client.c b/client.c
index 85a05ce..b808295 100644
--- a/client.c
+++ b/client.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/gpsd/Makefile b/gpsd/Makefile
index 81bf254..0645573 100755
--- a/gpsd/Makefile
+++ b/gpsd/Makefile
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: GPL-2.0
# -*- makefile -*-
#
-# Copyright (C) 2013-2019 B.A.T.M.A.N. contributors
+# Copyright (C) 2013-2020 B.A.T.M.A.N. contributors
#
# License-Filename: LICENSES/preferred/GPL-2.0
diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c
index 6e9137c..884bdbf 100644
--- a/gpsd/alfred-gpsd.c
+++ b/gpsd/alfred-gpsd.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2013-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
*
* Andrew Lunn, Simon Wunderlich
*
diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h
index addfa4f..5783eee 100644
--- a/gpsd/alfred-gpsd.h
+++ b/gpsd/alfred-gpsd.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2013-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
*
* Andrew Lunn, Simon Wunderlich
*
diff --git a/hash.c b/hash.c
index 02ac15e..82a287e 100644
--- a/hash.c
+++ b/hash.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2006-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
*
diff --git a/hash.h b/hash.h
index f5a8fb5..32a9e57 100644
--- a/hash.h
+++ b/hash.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2006-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
*
diff --git a/main.c b/main.c
index f633462..57bea61 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/netlink.c b/netlink.c
index e8fe55e..865ed9f 100644
--- a/netlink.c
+++ b/netlink.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch>
*
diff --git a/netlink.h b/netlink.h
index 26ad1e8..2964a2b 100644
--- a/netlink.h
+++ b/netlink.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch>
*
diff --git a/netsock.c b/netsock.c
index fcbc20b..9b200d2 100644
--- a/netsock.c
+++ b/netsock.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/packet.h b/packet.h
index 564afad..ad2dfa6 100644
--- a/packet.h
+++ b/packet.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: MIT */
-/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Sven Eckelmann
*
diff --git a/recv.c b/recv.c
index e7c2c24..74a0f85 100644
--- a/recv.c
+++ b/recv.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/send.c b/send.c
index d4043bc..02f4022 100644
--- a/send.c
+++ b/send.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/server.c b/server.c
index 18109cc..cdd5be2 100644
--- a/server.c
+++ b/server.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/unix_sock.c b/unix_sock.c
index 1d17cee..420affc 100644
--- a/unix_sock.c
+++ b/unix_sock.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/util.c b/util.c
index e14350e..f1dc0dc 100644
--- a/util.c
+++ b/util.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/vis/Makefile b/vis/Makefile
index 53d1f44..cfd0921 100755
--- a/vis/Makefile
+++ b/vis/Makefile
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: GPL-2.0
# -*- makefile -*-
#
-# Copyright (C) 2013-2019 B.A.T.M.A.N. contributors
+# Copyright (C) 2013-2020 B.A.T.M.A.N. contributors
#
# License-Filename: LICENSES/preferred/GPL-2.0
diff --git a/vis/vis.c b/vis/vis.c
index cdc5524..17e067e 100644
--- a/vis/vis.c
+++ b/vis/vis.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2013-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/vis/vis.h b/vis/vis.h
index fa5a248..3e8277a 100644
--- a/vis/vis.h
+++ b/vis/vis.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2013-2019 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
--
2.20.1
3 years, 1 month
[B.A.T.M.A.N.] batman-adv and/or batmand porting effort to FreeBSD
by Mahdi Mokhtari
Hi,
After some time of playing with the B.A.T.M.A.N protocol and
net-interface on OpenWRT and Debian I was thinking to use it with
the servers I use everyday (and maybe on routers/appliances I have
nanoBSD on).
So I started an effort...
(As a background) I already ported some applications to FreeBSD [and I'm
maintaining them] and
also I did work already on the Linux emulation layer of FreeBSD (FreeBSD
has a Linux syscall-emulation and Linux-KPI layers).
So my approach (as naturally I didn't expect the build of batman-adv.ko
to be successful as is),
was based on the approach that we [at FreeBSD] did to port Linux's
drm... <https://github.com/FreeBSDDesktop/kms-drm>
I ended up in adding some header-files to FreeBSD Linux-KPI (like
average.h, percpu.h, ...).
Now I'm at a state that Netlink blocks me and I'm to determine next step :-)
[Which I don't assume it being trivial with my current approach]
So I'd like to ask:
1- Is it better approach to "rewrite" batman-adv.ko [at least
Netlink-ish (let's call "Linuxism") parts] than what I'm doing now?
2- Any other efforts are being done out there?
3- is batmand deprecated [So I should mainly focus on batman-adv.ko]?
4- any other comments do you have? :D
P.S. sorry if I'm not really good at starting conversation from scratch
and out-of-nowhere :D
but I hope by continuing the collaboration we can have better (more
enriched) FreeBSD and better (as in more portable) B.A.T.M.A.N :-)
--
Best regards, MMokhi.
3 years, 1 month
Re: 回复: openwrt batman-adv
by Sven Eckelmann
On Saturday, 28 December 2019 03:32:17 CET 张鹏 wrote:
> Thank you very much for your reply!
> I have ported the pre-2019.2 version of batman to the 3.3 kernel and it is available for doing
Please don't do this. Now you are not only having the known bugs from Linux
3.3 but also the known bugs [1] from the pre-2019.2 batman-adv.
The correct approach is to get your used software updated to a non-EOL
version.
Kind regards,
Sven
[1] https://git.open-mesh.org/batman-adv.git/blob/HEAD:/CHANGELOG.rst
3 years, 1 month
openwrt batman-adv
by 张鹏
Hi,
The platform I work on is openwrt mips, the kernel I use is version 3.3; the version using batman is relatively low, and I want to use the newer version batman on version 3.3, but I encounter many problems during compilation, and I don't know it Whether it works ?
please help me!
thank you very much !
3 years, 1 month
KCSAN: data-race in add_timer / timer_clear_idle (2)
by syzbot
Hello,
syzbot found the following crash on:
HEAD commit: ef798c30 x86, kcsan: Enable KCSAN for x86
git tree: https://github.com/google/ktsan.git kcsan
console output: https://syzkaller.appspot.com/x/log.txt?x=156e052ee00000
kernel config: https://syzkaller.appspot.com/x/.config?x=8077a73bd604a9d4
dashboard link: https://syzkaller.appspot.com/bug?extid=c051abeff5e2e8ac40f0
compiler: gcc (GCC) 9.0.0 20181231 (experimental)
Unfortunately, I don't have any reproducer for this crash yet.
IMPORTANT: if you fix the bug, please add the following tag to the commit:
Reported-by: syzbot+c051abeff5e2e8ac40f0(a)syzkaller.appspotmail.com
==================================================================
BUG: KCSAN: data-race in add_timer / timer_clear_idle
read to 0xffff88812be1b6e4 of 1 bytes by task 23 on cpu 1:
forward_timer_base kernel/time/timer.c:892 [inline]
__mod_timer kernel/time/timer.c:1009 [inline]
mod_timer kernel/time/timer.c:1100 [inline]
add_timer+0x3a6/0x550 kernel/time/timer.c:1136
__queue_delayed_work+0x13b/0x1d0 kernel/workqueue.c:1649
queue_delayed_work_on+0xf3/0x110 kernel/workqueue.c:1674
queue_delayed_work include/linux/workqueue.h:509 [inline]
batadv_mcast_start_timer net/batman-adv/multicast.c:71 [inline]
batadv_mcast_mla_update+0x11ad/0x19e0 net/batman-adv/multicast.c:949
process_one_work+0x3d4/0x890 kernel/workqueue.c:2269
worker_thread+0xa0/0x800 kernel/workqueue.c:2415
kthread+0x1d4/0x200 drivers/block/aoe/aoecmd.c:1253
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:352
write to 0xffff88812be1b6e4 of 1 bytes by task 0 on cpu 0:
timer_clear_idle+0x42/0x50 kernel/time/timer.c:1675
tick_nohz_restart_sched_tick kernel/time/tick-sched.c:839 [inline]
__tick_nohz_idle_restart_tick+0x36/0x1b0 kernel/time/tick-sched.c:1140
tick_nohz_idle_exit+0x1af/0x1e0 kernel/time/tick-sched.c:1181
do_idle+0xb1/0x280 kernel/sched/idle.c:276
cpu_startup_entry+0x1b/0x20 kernel/sched/idle.c:355
rest_init+0xec/0xf6 init/main.c:452
arch_call_rest_init+0x17/0x37
start_kernel+0x838/0x85e init/main.c:786
x86_64_start_reservations+0x29/0x2b arch/x86/kernel/head64.c:490
x86_64_start_kernel+0x72/0x76 arch/x86/kernel/head64.c:471
secondary_startup_64+0xa4/0xb0 arch/x86/kernel/head_64.S:241
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.4.0-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS
Google 01/01/2011
==================================================================
---
This bug is generated by a bot. It may contain errors.
See https://goo.gl/tpsmEJ for more information about syzbot.
syzbot engineers can be reached at syzkaller(a)googlegroups.com.
syzbot will keep track of this bug report. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
3 years, 1 month
[PATCH] batman-adv: Replace FIELD_SIZEOF with sizeof_field
by Sven Eckelmann
The prefered way of getting the size of a member of a struct is the common
macro sizeof_field from stddef.h and not the FIELD_SIZEOF (with multiple
definitions).
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
---
compat-include/linux/stddef.h | 24 ++++++++++++++++++++++++
net/batman-adv/main.c | 2 +-
2 files changed, 25 insertions(+), 1 deletion(-)
create mode 100644 compat-include/linux/stddef.h
diff --git a/compat-include/linux/stddef.h b/compat-include/linux/stddef.h
new file mode 100644
index 00000000..dd18840e
--- /dev/null
+++ b/compat-include/linux/stddef.h
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner, Simon Wunderlich
+ *
+ * This file contains macros for maintaining compatibility with older versions
+ * of the Linux kernel.
+ */
+
+#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_
+#define _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_
+
+#include <linux/version.h>
+#include_next <linux/stddef.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+
+#ifndef sizeof_field
+#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER))
+#endif
+
+#endif /* < KERNEL_VERSION(4, 16, 0) */
+
+#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ */
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 4a89177d..4811ec65 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -548,7 +548,7 @@ static void batadv_recv_handler_init(void)
BUILD_BUG_ON(sizeof(struct batadv_tvlv_tt_change) != 12);
BUILD_BUG_ON(sizeof(struct batadv_tvlv_roam_adv) != 8);
- i = FIELD_SIZEOF(struct sk_buff, cb);
+ i = sizeof_field(struct sk_buff, cb);
BUILD_BUG_ON(sizeof(struct batadv_skb_cb) > i);
/* broadcast packet */
--
2.20.1
3 years, 2 months