From ca6c9edc3e5f3cb1069e8cf2a8c050d9bde99e5e Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 19 Nov 2021 16:55:58 +0100 Subject: [PATCH] batman-adv: update to version 2021.4 * support latest kernels (4.4 - 5.16) * coding style cleanups and refactoring * bugs squashed: - fix error handling during interface initialization Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 4 ++-- batman-adv/src/compat-hacks.h | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 967965e..db4d8b0 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv -PKG_VERSION:=2021.3 +PKG_VERSION:=2021.4 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) -PKG_HASH:=b24deec9baee786ca91085e32f7e09d4cc94f965ae71c9560895f82ec1cc906b +PKG_HASH:=cff7a2f160045fd0dbf1f1cd7e35e93bf489e81cb8b9501b3756daa391f3eb1b PKG_EXTMOD_SUBDIRS:=net/batman-adv PKG_MAINTAINER:=Simon Wunderlich diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h index 0b8b2e1..ddd8671 100644 --- a/batman-adv/src/compat-hacks.h +++ b/batman-adv/src/compat-hacks.h @@ -112,6 +112,13 @@ static inline void batadv_dev_hold(struct net_device *dev) } #define dev_hold batadv_dev_hold +static inline void batadv_eth_hw_addr_set(struct net_device *dev, + const u8 *addr) +{ + ether_addr_copy(dev->dev_addr, addr); +} +#define eth_hw_addr_set batadv_eth_hw_addr_set + #endif /* LINUX_VERSION_IS_LESS(5, 15, 0) */ /* */ -- 2.30.2