Repository : ssh://git@open-mesh.org/openwrt-feed-devel

On branch : master

commit eea8dff624d4e5331db6e9582ac0bb22ac02d90a Author: Marek Lindner mareklindner@neomailbox.ch Date: Sun May 8 22:27:03 2016 +0800

batman-adv-devel: support multicast optimization in bridged setups

Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

eea8dff624d4e5331db6e9582ac0bb22ac02d90a batman-adv-devel/Makefile | 8 +++++++- batman-adv-devel/files/compat-hacks.h | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 7a2dcb2..fa012fb 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -71,8 +71,14 @@ NOSTDINC_FLAGS = \ -include $(PKG_BUILD_DIR)/compat-hacks.h \ -DBATADV_SOURCE_VERSION=\"$(PKG_BATMAN_SHORTREV)\" \

+COMPAT_SOURCES = \ + $(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \ + $(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/ipv4/igmp.o,) \ + $(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/ipv6/mcast_snoop.o,) \ + define Build/Compile - +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ + +env "batman-adv-y=$(COMPAT_SOURCES)" \ + $(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ SUBDIRS="$(PKG_BUILD_DIR)/net/batman-adv" \ diff --git a/batman-adv-devel/files/compat-hacks.h b/batman-adv-devel/files/compat-hacks.h index a910c2d..e8b064c 100644 --- a/batman-adv-devel/files/compat-hacks.h +++ b/batman-adv-devel/files/compat-hacks.h @@ -31,6 +31,17 @@

#endif /* < KERNEL_VERSION(4, 5, 0) */

+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) + +struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb, + unsigned int transport_len, + __sum16(*skb_chkf)(struct sk_buff *skb)); + +int ip_mc_check_igmp(struct sk_buff *skb, struct sk_buff **skb_trimmed); + +int ipv6_mc_check_mld(struct sk_buff *skb, struct sk_buff **skb_trimmed); + +#endif /* < KERNEL_VERSION(4, 2, 0) */

#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)