batman-adv: update to version 2024.2
authorSven Eckelmann <sven@narfation.org>
Sat, 22 Jun 2024 19:33:40 +0000 (21:33 +0200)
committerSven Eckelmann <sven@narfation.org>
Sat, 22 Jun 2024 19:33:40 +0000 (21:33 +0200)
* support latest kernels (4.19 - 6.10)
* coding style cleanups and refactoring

Signed-off-by: Sven Eckelmann <sven@narfation.org>
batman-adv/Makefile
batman-adv/patches/0003-Revert-batman-adv-Switch-to-linux-sprintf.h.patch
batman-adv/patches/0004-Revert-batman-adv-Switch-to-linux-array_size.h.patch

index 125089dd3d04cf5c3f99fbc47b4af3cb1a68b0a9..0b20009298c9b8cd7210023bc11bc29534363bd0 100644 (file)
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_VERSION:=2024.1
+PKG_VERSION:=2024.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
-PKG_HASH:=a714329c6251f4830e9cf03f53cbfb2280f0678471b54c5d46fae61a782d4325
+PKG_HASH:=7692a6dee7a2f3f66732e9aec8c7164e0c1818167f3af063bff3fffbb0199643
 PKG_EXTMOD_SUBDIRS:=net/batman-adv
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
index 36924335c89a21076286d825240eaf0be7b66559..e072f56e40fd6fe1d7d3cc441ecd01b64d5b05ed 100644 (file)
@@ -69,7 +69,7 @@ This reverts commit f0fb49c5ab70dfa064f0aa8d1c5d84f65e8cbc86.
  #include <net/sock.h>
 --- a/net/batman-adv/main.c
 +++ b/net/batman-adv/main.c
-@@ -32,7 +32,6 @@
+@@ -31,7 +31,6 @@
  #include <linux/skbuff.h>
  #include <linux/slab.h>
  #include <linux/spinlock.h>
index 888b4ede137b1e6ab62a3f903cb69a7a69104e03..838cc93e983d502f39dbe9b7f3630faad085cd17 100644 (file)
@@ -41,7 +41,7 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2.
  #include <linux/atomic.h>
  #include <linux/build_bug.h>
  #include <linux/byteorder/generic.h>
-@@ -20,6 +19,7 @@
+@@ -19,6 +18,7 @@
  #include <linux/init.h>
  #include <linux/ip.h>
  #include <linux/ipv6.h>
@@ -59,7 +59,7 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2.
  #include <linux/atomic.h>
  #include <linux/bitops.h>
  #include <linux/bug.h>
-@@ -20,6 +19,7 @@
+@@ -19,6 +18,7 @@
  #include <linux/if_ether.h>
  #include <linux/if_vlan.h>
  #include <linux/init.h>