batman-adv: update to version 2024.2

* support latest kernels (4.19 - 6.10)
* coding style cleanups and refactoring

Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
Sven Eckelmann
2024-06-22 21:33:40 +02:00
parent be0dcb3b30
commit e6cebf66cf
3 changed files with 5 additions and 5 deletions

View File

@@ -3,12 +3,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv PKG_NAME:=batman-adv
PKG_VERSION:=2024.1 PKG_VERSION:=2024.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) 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_EXTMOD_SUBDIRS:=net/batman-adv
PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de> PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>

View File

@@ -69,7 +69,7 @@ This reverts commit f0fb49c5ab70dfa064f0aa8d1c5d84f65e8cbc86.
#include <net/sock.h> #include <net/sock.h>
--- a/net/batman-adv/main.c --- a/net/batman-adv/main.c
+++ b/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/skbuff.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>

View File

@@ -41,7 +41,7 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2.
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/build_bug.h> #include <linux/build_bug.h>
#include <linux/byteorder/generic.h> #include <linux/byteorder/generic.h>
@@ -20,6 +19,7 @@ @@ -19,6 +18,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
@@ -59,7 +59,7 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2.
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/bug.h> #include <linux/bug.h>
@@ -20,6 +19,7 @@ @@ -19,6 +18,7 @@
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/init.h> #include <linux/init.h>