From b429e28714296aaa14c03a0db6e53dd84cad3b25 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Fri, 28 Oct 2016 09:46:15 +0200
Subject: [PATCH] batctl: upgrade package to latest release 2016.4

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batctl/Makefile                               |  4 +-
 ...around-uclibc-collision-for-__unused.patch | 77 -------------------
 2 files changed, 2 insertions(+), 79 deletions(-)
 delete mode 100644 batctl/patches/0001-batctl-Work-around-uclibc-collision-for-__unused.patch

diff --git a/batctl/Makefile b/batctl/Makefile
index 36cea26..7ae81b5 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
 
-PKG_VERSION:=2016.3
+PKG_VERSION:=2016.4
 PKG_RELEASE:=0
-PKG_MD5SUM:=533cbbe981bd0e9fc9ec73ed59379960
+PKG_MD5SUM:=0112f35b2a48d32f23a17a6f45348e63
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
diff --git a/batctl/patches/0001-batctl-Work-around-uclibc-collision-for-__unused.patch b/batctl/patches/0001-batctl-Work-around-uclibc-collision-for-__unused.patch
deleted file mode 100644
index 558bc9d..0000000
--- a/batctl/patches/0001-batctl-Work-around-uclibc-collision-for-__unused.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sun, 4 Sep 2016 20:20:40 +0200
-Subject: [PATCH] batctl: Work around uclibc collision for __unused
-
-uclibc on 64 bit systems uses struct members called __unused. These
-conflict with the definition of __unused in batctl. Such a conflict results
-in a build error because the struct member will be replaced with the
-__attribute__((unused)).
-
-This can be avoided by renaming it to the Linux kernel name
-"__maybe_unused".
-
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
----
- genl.c     | 4 ++--
- main.h     | 2 +-
- tp_meter.c | 5 +++--
- 3 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/genl.c b/genl.c
-index b6f66fd..36fc27e 100644
---- a/genl.c
-+++ b/genl.c
-@@ -34,7 +34,7 @@
- 
- #include "batman_adv.h"
- 
--static int mcast_error_handler(struct sockaddr_nl *nla __unused,
-+static int mcast_error_handler(struct sockaddr_nl *nla __maybe_unused,
- 			       struct nlmsgerr *err, void *arg)
- {
- 	int *ret = arg;
-@@ -42,7 +42,7 @@ static int mcast_error_handler(struct sockaddr_nl *nla __unused,
- 	return NL_STOP;
- }
- 
--static int mcast_ack_handler(struct nl_msg *msg __unused, void *arg)
-+static int mcast_ack_handler(struct nl_msg *msg __maybe_unused, void *arg)
- {
- 	int *ret = arg;
- 	*ret = 0;
-diff --git a/main.h b/main.h
-index 01f70e8..12c33b7 100644
---- a/main.h
-+++ b/main.h
-@@ -47,7 +47,7 @@
- #endif
- 
- #define __packed __attribute((packed))   /* linux kernel compat */
--#define __unused __attribute__((unused))
-+#define __maybe_unused __attribute__((unused))
- #define BIT(nr)                 (1UL << (nr)) /* linux kernel compat */
- 
- typedef uint8_t u8; /* linux kernel compat */
-diff --git a/tp_meter.c b/tp_meter.c
-index 43c19da..a402e45 100644
---- a/tp_meter.c
-+++ b/tp_meter.c
-@@ -66,7 +66,7 @@ struct tp_cookie {
- 	uint32_t cookie;
- };
- 
--static int tpmeter_nl_print_error(struct sockaddr_nl *nla __unused,
-+static int tpmeter_nl_print_error(struct sockaddr_nl *nla __maybe_unused,
- 				  struct nlmsgerr *nlerr,
- 				  void *arg)
- {
-@@ -236,7 +236,8 @@ out:
- 	return err;
- }
- 
--static int no_seq_check(struct nl_msg *msg __unused, void *arg __unused)
-+static int no_seq_check(struct nl_msg *msg __maybe_unused,
-+			void *arg __maybe_unused)
- {
- 	return NL_OK;
- }
-- 
2.35.1