batman-adv: update to version 2022.3
* support latest kernels (4.9 - 6.1) * coding style cleanups and refactoring * bugs squashed: - limit the minimum MTU of hard-interface to avoid "Forced to purge local tt entries" errors Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
parent
c2f9428ac5
commit
081291592e
|
@ -3,12 +3,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=batman-adv
|
PKG_NAME:=batman-adv
|
||||||
PKG_VERSION:=2022.2
|
PKG_VERSION:=2022.3
|
||||||
PKG_RELEASE:=$(AUTORELEASE)
|
PKG_RELEASE:=$(AUTORELEASE)
|
||||||
|
|
||||||
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:=8aca27c6f168b137a7ed7031d58169396c1a97f958c2ea95b9c30a9b92576fe0
|
PKG_HASH:=218ffb534fead1c9b5b0d90ec1b2fba688209cdf00e861bece1cbf469fe69953
|
||||||
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>
|
||||||
|
|
|
@ -117,11 +117,12 @@ This reverts commit 043ae5634bdfd4c4dd8b95a22890752495080bb5.
|
||||||
#include <linux/gfp.h>
|
#include <linux/gfp.h>
|
||||||
--- a/net/batman-adv/hard-interface.c
|
--- a/net/batman-adv/hard-interface.c
|
||||||
+++ b/net/batman-adv/hard-interface.c
|
+++ b/net/batman-adv/hard-interface.c
|
||||||
@@ -9,11 +9,11 @@
|
@@ -9,12 +9,12 @@
|
||||||
|
|
||||||
#include <linux/atomic.h>
|
#include <linux/atomic.h>
|
||||||
#include <linux/byteorder/generic.h>
|
#include <linux/byteorder/generic.h>
|
||||||
-#include <linux/container_of.h>
|
-#include <linux/container_of.h>
|
||||||
|
#include <linux/errno.h>
|
||||||
#include <linux/gfp.h>
|
#include <linux/gfp.h>
|
||||||
#include <linux/if.h>
|
#include <linux/if.h>
|
||||||
#include <linux/if_arp.h>
|
#include <linux/if_arp.h>
|
||||||
|
|
|
@ -74,6 +74,14 @@ static inline int batadv_netif_rx(struct sk_buff *skb)
|
||||||
|
|
||||||
#endif /* LINUX_VERSION_IS_LESS(5, 18, 0) */
|
#endif /* LINUX_VERSION_IS_LESS(5, 18, 0) */
|
||||||
|
|
||||||
|
#if LINUX_VERSION_IS_LESS(6, 0, 0)
|
||||||
|
|
||||||
|
#define __vstring(item, fmt, ap) __dynamic_array(char, item, 256)
|
||||||
|
#define __assign_vstr(dst, fmt, va) \
|
||||||
|
WARN_ON_ONCE(vsnprintf(__get_dynamic_array(dst), 256, fmt, *va) >= 256)
|
||||||
|
|
||||||
|
#endif /* LINUX_VERSION_IS_LESS(6, 0, 0) */
|
||||||
|
|
||||||
/* <DECLARE_EWMA> */
|
/* <DECLARE_EWMA> */
|
||||||
|
|
||||||
#include <linux/version.h>
|
#include <linux/version.h>
|
||||||
|
|
Loading…
Reference in New Issue