[PATCH 1/3] alfred: Update copyright years for 2021
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 6268cb9..57206e0 100755
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: GPL-2.0
# -*- makefile -*-
#
-# Copyright (C) 2012-2020 B.A.T.M.A.N. contributors
+# Copyright (C) 2012-2021 B.A.T.M.A.N. contributors
#
# License-Filename: LICENSES/preferred/GPL-2.0
diff --git a/alfred.h b/alfred.h
index a61365d..8a9d244 100644
--- a/alfred.h
+++ b/alfred.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/batadv_query.c b/batadv_query.c
index 66d3452..410d271 100644
--- a/batadv_query.c
+++ b/batadv_query.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/batadv_query.h b/batadv_query.h
index 291292d..f198de9 100644
--- a/batadv_query.h
+++ b/batadv_query.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
*
diff --git a/batadv_querynl.c b/batadv_querynl.c
index 2793242..d9a6028 100644
--- a/batadv_querynl.c
+++ b/batadv_querynl.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 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 f684ad8..7f969b9 100644
--- a/batadv_querynl.h
+++ b/batadv_querynl.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 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 bdb317f..27d35e7 100644
--- a/batman_adv.h
+++ b/batman_adv.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: MIT */
-/* Copyright (C) 2016-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2016-2021 B.A.T.M.A.N. contributors:
*
* Matthias Schiffer
*/
diff --git a/bitops.h b/bitops.h
index 2333aa4..802fc25 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-2020, Sven Eckelmann <sven(a)narfation.org>
+ * Copyright (c) 2012-2021, Sven Eckelmann <sven(a)narfation.org>
*
* License-Filename: LICENSES/preferred/MIT
*/
diff --git a/client.c b/client.c
index b19887d..bd38c2f 100644
--- a/client.c
+++ b/client.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/gpsd/Makefile b/gpsd/Makefile
index 0645573..b02404d 100755
--- a/gpsd/Makefile
+++ b/gpsd/Makefile
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: GPL-2.0
# -*- makefile -*-
#
-# Copyright (C) 2013-2020 B.A.T.M.A.N. contributors
+# Copyright (C) 2013-2021 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 47d6a64..ee9e6e8 100644
--- a/gpsd/alfred-gpsd.c
+++ b/gpsd/alfred-gpsd.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2021 B.A.T.M.A.N. contributors:
*
* Andrew Lunn, Simon Wunderlich
*
diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h
index b5452b4..83d65bc 100644
--- a/gpsd/alfred-gpsd.h
+++ b/gpsd/alfred-gpsd.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2021 B.A.T.M.A.N. contributors:
*
* Andrew Lunn, Simon Wunderlich
*
diff --git a/hash.c b/hash.c
index 82a287e..eb7ff1a 100644
--- a/hash.c
+++ b/hash.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
*
diff --git a/hash.h b/hash.h
index 32a9e57..0ff887a 100644
--- a/hash.h
+++ b/hash.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
*
diff --git a/main.c b/main.c
index 5ae8187..37cc5eb 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/netlink.c b/netlink.c
index 865ed9f..5470b48 100644
--- a/netlink.c
+++ b/netlink.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 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 2964a2b..74c32b5 100644
--- a/netlink.h
+++ b/netlink.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 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 9b200d2..28beef1 100644
--- a/netsock.c
+++ b/netsock.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/packet.h b/packet.h
index 81ecbb9..7e91c58 100644
--- a/packet.h
+++ b/packet.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: MIT */
-/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Sven Eckelmann
*
diff --git a/recv.c b/recv.c
index 744080b..c4ac7e4 100644
--- a/recv.c
+++ b/recv.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/send.c b/send.c
index de530d9..5afe374 100644
--- a/send.c
+++ b/send.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/server.c b/server.c
index 37b11fe..5ea6683 100644
--- a/server.c
+++ b/server.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/unix_sock.c b/unix_sock.c
index 2bbc408..b05b8a2 100644
--- a/unix_sock.c
+++ b/unix_sock.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/util.c b/util.c
index f1dc0dc..c1ee1fa 100644
--- a/util.c
+++ b/util.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/vis/Makefile b/vis/Makefile
index 50c8efb..ab79775 100755
--- a/vis/Makefile
+++ b/vis/Makefile
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: GPL-2.0
# -*- makefile -*-
#
-# Copyright (C) 2013-2020 B.A.T.M.A.N. contributors
+# Copyright (C) 2013-2021 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 1bb82ab..3b1f37c 100644
--- a/vis/vis.c
+++ b/vis/vis.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
diff --git a/vis/vis.h b/vis/vis.h
index 6f5b839..8033db6 100644
--- a/vis/vis.h
+++ b/vis/vis.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
--
2.29.2
3 months, 2 weeks
[PATCH] batman-adv: Avoid sizeof on flexible structure
by Sven Eckelmann
The batadv_dhcp_packet is used to read in parts of the DHCP packet and
extract relevant information for the distributed arp table. But the
structure contained the flexible member "options" which is no where used in
the code.
A sizeof on this kind of type would return the size of everything except
the flexible member. But sparse will detect this kind of sizeof and warn
with
warning: using sizeof on a flexible structure
This can be avoided by dropping the unused flexible member.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
---
net/batman-adv/distributed-arp-table.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index fd7ba6bb..d2ec419d 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -87,7 +87,7 @@ struct batadv_dhcp_packet {
__u8 sname[64];
__u8 file[128];
__be32 magic;
- __u8 options[];
+ /* __u8 options[]; */
};
#define BATADV_DHCP_YIADDR_LEN sizeof(((struct batadv_dhcp_packet *)0)->yiaddr)
--
2.29.2
3 months, 2 weeks
Routing Announcement Alfred Through
by nybash110998＠gmail.com
Hello Everyone!
I want to present to the community my idea about spreading static ipv4 routes between mesh nodes.
So, it is my first project in C, before I only have an experience in bash. I know, it might have some weird methods (first painting cannot be good), but I am trying my best.
You can see what I suggest on my github page: https://github.com/nickbash11/raat , there you will find comprehensive information about what and how.
It just tries to recap the "community" mode in BMX6/BMX7 but with ALFRED. For now I test it between some virtualbox machines with OpenWRT 18/19. This time I do not have hardware resources (routers) to test it on the real network :(
All my devices are busy with qMp and I want to try some "pure" in the future, but I really used to see that each node has its own network behind it.
Maybe, I have invented a bicycle... don't no, anyway, check me out.
4 months
[PATCH 0/8] pull request for net-next: batman-adv 2020-12-04
by Simon Wunderlich
Hi David, hi Jakub,
here is a late cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 992b03b88e36254e26e9a4977ab948683e21bd9f:
batman-adv: Don't always reallocate the fragmentation skb head (2020-11-27 08:02:55 +0100)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20201204
for you to fetch changes up to 34a14c2e6310a348a3f23af6e95bf9ea040f3ec8:
batman-adv: Drop unused soft-interface.h include in fragmentation.c (2020-12-04 08:41:16 +0100)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- update include for min/max helpers, by Sven Eckelmann
- add infrastructure and netlink functions for routing algo selection,
by Sven Eckelmann (2 patches)
- drop deprecated debugfs and sysfs support and obsoleted
functionality, by Sven Eckelmann (3 patches)
- drop unused include in fragmentation.c, by Simon Wunderlich
----------------------------------------------------------------
Simon Wunderlich (2):
batman-adv: Start new development cycle
batman-adv: Drop unused soft-interface.h include in fragmentation.c
Sven Eckelmann (6):
batman-adv: Add new include for min/max helpers
batman-adv: Prepare infrastructure for newlink settings
batman-adv: Allow selection of routing algorithm over rtnetlink
batman-adv: Drop deprecated sysfs support
batman-adv: Drop deprecated debugfs support
batman-adv: Drop legacy code for auto deleting mesh interfaces
.../ABI/obsolete/sysfs-class-net-batman-adv | 32 -
Documentation/ABI/obsolete/sysfs-class-net-mesh | 110 --
MAINTAINERS | 2 -
include/uapi/linux/batman_adv.h | 26 +
net/batman-adv/Kconfig | 27 +-
net/batman-adv/Makefile | 3 -
net/batman-adv/bat_algo.c | 34 +-
net/batman-adv/bat_algo.h | 5 +-
net/batman-adv/bat_iv_ogm.c | 229 ----
net/batman-adv/bat_v.c | 247 +---
net/batman-adv/bat_v_elp.c | 1 +
net/batman-adv/bat_v_ogm.c | 1 +
net/batman-adv/bridge_loop_avoidance.c | 130 --
net/batman-adv/bridge_loop_avoidance.h | 16 -
net/batman-adv/debugfs.c | 442 -------
net/batman-adv/debugfs.h | 73 --
net/batman-adv/distributed-arp-table.c | 55 -
net/batman-adv/distributed-arp-table.h | 2 -
net/batman-adv/fragmentation.c | 3 +-
net/batman-adv/gateway_client.c | 39 -
net/batman-adv/gateway_client.h | 2 -
net/batman-adv/hard-interface.c | 35 +-
net/batman-adv/hard-interface.h | 25 +-
net/batman-adv/icmp_socket.c | 392 ------
net/batman-adv/icmp_socket.h | 38 -
net/batman-adv/log.c | 209 ----
net/batman-adv/main.c | 46 +-
net/batman-adv/main.h | 5 +-
net/batman-adv/multicast.c | 111 --
net/batman-adv/multicast.h | 3 -
net/batman-adv/netlink.c | 1 +
net/batman-adv/network-coding.c | 87 --
net/batman-adv/network-coding.h | 13 -
net/batman-adv/originator.c | 121 --
net/batman-adv/originator.h | 4 -
net/batman-adv/routing.c | 10 -
net/batman-adv/soft-interface.c | 137 +--
net/batman-adv/soft-interface.h | 1 -
net/batman-adv/sysfs.c | 1272 --------------------
net/batman-adv/sysfs.h | 93 --
net/batman-adv/tp_meter.c | 1 +
net/batman-adv/translation-table.c | 212 ----
net/batman-adv/translation-table.h | 3 -
net/batman-adv/types.h | 66 -
44 files changed, 121 insertions(+), 4243 deletions(-)
delete mode 100644 Documentation/ABI/obsolete/sysfs-class-net-batman-adv
delete mode 100644 Documentation/ABI/obsolete/sysfs-class-net-mesh
delete mode 100644 net/batman-adv/debugfs.c
delete mode 100644 net/batman-adv/debugfs.h
delete mode 100644 net/batman-adv/icmp_socket.c
delete mode 100644 net/batman-adv/icmp_socket.h
delete mode 100644 net/batman-adv/sysfs.c
delete mode 100644 net/batman-adv/sysfs.h
4 months, 2 weeks
[PATCH 1/2] vxlan: Add needed_headroom for lower device
by Sven Eckelmann
It was observed that sending data via batadv over vxlan (on top of
wireguard) reduced the performance massively compared to raw ethernet or
batadv on raw ethernet. A check of perf data showed that the
vxlan_build_skb was calling all the time pskb_expand_head to allocate
enough headroom for:
min_headroom = LL_RESERVED_SPACE(dst->dev) + dst->header_len
+ VXLAN_HLEN + iphdr_len;
But the vxlan_config_apply only requested needed headroom for:
lowerdev->hard_header_len + VXLAN6_HEADROOM or VXLAN_HEADROOM
So it completely ignored the needed_headroom of the lower device. The first
caller of net_dev_xmit could therefore never make sure that enough headroom
was allocated for the rest of the transmit path.
Cc: Annika Wickert <annika.wickert(a)exaring.de>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
---
drivers/net/vxlan.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 236fcc55a5fd..25b5b5a2dfea 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -3799,6 +3799,7 @@ static void vxlan_config_apply(struct net_device *dev,
dev->gso_max_segs = lowerdev->gso_max_segs;
needed_headroom = lowerdev->hard_header_len;
+ needed_headroom += lowerdev->needed_headroom;
max_mtu = lowerdev->mtu - (use_ipv6 ? VXLAN6_HEADROOM :
VXLAN_HEADROOM);
--
2.29.2
4 months, 2 weeks
