-Updating to maintain kernel compability

-dropping mesh-no-rebroadcast in favour to the next level "Broadcast Avoidances" which is proposed
-dropping uneeded patch for fragment sizes, because this bug has been fixed

4 files changed, 10 insertions, 210 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd9eac06f231..1ccecb566cd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sat Apr  8 04:00:41 UTC 2017
 pkgbase = batman-adv
 	pkgdesc = batman kernel module
-	pkgver = 2016.4
+	pkgver = 2017.0.1
 	pkgrel = 0
 	epoch = 1
 	url = https://www.open-mesh.net/
@@ -10,14 +12,10 @@ pkgbase = batman-adv
 	license = GPL
 	makedepends = linux-headers
 	depends = linux
-	source = https://downloads.open-mesh.org/batman/releases/batman-adv-2016.4/batman-adv-2016.4.tar.gz
+	source = https://downloads.open-mesh.org/batman/releases/batman-adv-2017.0.1/batman-adv-2017.0.1.tar.gz
 	source = batman-adv.install
-	source = 1001-batman-adv-introduce-no_rebroadcast-option.patch
-	source = 1002-batman-adv-decrease-maximum-fragment-size.patch
-	sha256sums = bc1236dd83209db51a09368b7ed1dd3a1ce5f5b933e09260c4d6f107c0a150eb
+	sha256sums = 55c2bc9739c5ef13d6951705431a3bcc4b9e5686be9c8d742923d1149f04c47c
 	sha256sums = 347599c02426a905690002885c277f91b82da2b29d3372348e5f02d03c435c37
-	sha256sums = f86ba376f8563b9eb2e040fad8282949d4c61413fced068204a8de0523392c1f
-	sha256sums = 1501d6fef6497461d2439505eeeb264f02f2ecfb06e7101908d72fc4d1953c14
 
 pkgname = batman-adv
 
diff --git a/1001-batman-adv-introduce-no_rebroadcast-option.patch b/1001-batman-adv-introduce-no_rebroadcast-option.patch
deleted file mode 100644
index 80a99479d9d3..000000000000
--- a/1001-batman-adv-introduce-no_rebroadcast-option.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From bb66988dc6972d5400b4ff4f0b49ed090007d635 Mon Sep 17 00:00:00 2001
-Message-Id: <bb66988dc6972d5400b4ff4f0b49ed090007d635.1466049319.git.mschiffer@universe-factory.net>
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@web.de>
-Date: Tue, 24 Sep 2013 04:36:27 +0200
-Subject: [PATCH 1/2] batman-adv: introduce 'no_rebroadcast' option
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch introduces a new sysfs option named "no_rebroadcast" on
-a per hard interface basis. It allows manually enabling a split-horizon
-like behaviour for the layer 2 multicast payload frames, in that
-incoming multicast payload frames on such a hard interface are only
-being rebroadcasted on all interfaces except the incoming one instead
-of being rebroadcasted on all interfaces.
-
-Such an option should only be enabled if you are certain that these
-rebroadcasts are unnecessary. This is usually the case for instance
-for point-to-point wifi longshots or wired links.
-
-This option can especially safe a significant amount of upload overhead
-if the neighbourhood on a link is rather large, for instance in some
-transitive, symmetric VPN configurations.
-
-Using this option wrongly will break your mesh network, use this option
-wisely and at your own risk!
-
----
- net/batman-adv/hard-interface.c                    |  2 +
- net/batman-adv/send.c                              |  4 ++
- net/batman-adv/sysfs.c                             | 59 ++++++++++++++++++++++
- net/batman-adv/types.h                             |  1 +
- 4 files changed
-
-diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
-index 8c2f399..48e53d0 100644
---- a/net/batman-adv/hard-interface.c
-+++ b/net/batman-adv/hard-interface.c
-@@ -690,6 +690,8 @@ batadv_hardif_add_interface(struct net_device *net_dev)
- 	kref_init(&hard_iface->refcount);
- 	kref_get(&hard_iface->refcount);
- 
-+	atomic_set(&hard_iface->no_rebroadcast, 0);
-+
- 	batadv_check_known_mac_addr(hard_iface->net_dev);
- 	list_add_tail_rcu(&hard_iface->list, &batadv_hardif_list);
- 
-diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
-index f2f1256..3736d75 100644
---- a/net/batman-adv/send.c
-+++ b/net/batman-adv/send.c
-@@ -578,6 +578,10 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work)
- 		if (forw_packet->num_packets >= hard_iface->num_bcasts)
- 			continue;
- 
-+		if (atomic_read(&hard_iface->no_rebroadcast) &&
-+		    forw_packet->skb->dev == hard_iface->net_dev)
-+			continue;
-+
- 		if (!kref_get_unless_zero(&hard_iface->refcount))
- 			continue;
- 
-diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
-index 414b207..9aa043f 100644
---- a/net/batman-adv/sysfs.c
-+++ b/net/batman-adv/sysfs.c
-@@ -134,6 +134,17 @@ struct batadv_attribute batadv_attr_vlan_##_name = {	\
- 	.store  = _store,				\
- }
- 
-+/* Use this, if you have customized show and store functions
-+ * for hard interface attrs
-+ */
-+#define BATADV_ATTR_HIF(_name, _mode, _show, _store)	\
-+struct batadv_attribute batadv_attr_hif_##_name = {	\
-+	.attr = {.name = __stringify(_name),		\
-+		 .mode = _mode },			\
-+	.show   = _show,				\
-+	.store  = _store,				\
-+};
-+
- /* Use this, if you have customized show and store functions */
- #define BATADV_ATTR(_name, _mode, _show, _store)	\
- struct batadv_attribute batadv_attr_##_name = {		\
-@@ -293,6 +304,52 @@ ssize_t batadv_show_##_name(struct kobject *kobj,			\
- 	static BATADV_ATTR(_name, _mode, batadv_show_##_name,		\
- 			   batadv_store_##_name)
- 
-+#define BATADV_ATTR_HIF_STORE_BOOL(_name, _post_func)			\
-+ssize_t batadv_store_hif_##_name(struct kobject *kobj,			\
-+				 struct attribute *attr, char *buff,	\
-+				 size_t count)				\
-+{									\
-+	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);	\
-+	struct batadv_hard_iface *hard_iface;				\
-+	size_t res;							\
-+									\
-+	hard_iface = batadv_hardif_get_by_netdev(net_dev);		\
-+	if (!hard_iface)						\
-+		return 0;						\
-+									\
-+	res = __batadv_store_bool_attr(buff, count, _post_func,		\
-+					      attr, &hard_iface->_name,	\
-+					      hard_iface->soft_iface);	\
-+	batadv_hardif_put(hard_iface);					\
-+	return res;							\
-+}
-+
-+#define BATADV_ATTR_HIF_SHOW_BOOL(_name)				\
-+ssize_t batadv_show_hif_##_name(struct kobject *kobj,			\
-+				struct attribute *attr, char *buff)	\
-+{									\
-+	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);	\
-+	struct batadv_hard_iface *hard_iface;				\
-+	size_t res;							\
-+									\
-+	hard_iface = batadv_hardif_get_by_netdev(net_dev);		\
-+	if (!hard_iface)						\
-+		return 0;						\
-+									\
-+	res = sprintf(buff, "%s\n",					\
-+		      atomic_read(&hard_iface->_name) == 0 ?		\
-+				"disabled" : "enabled");		\
-+	batadv_hardif_put(hard_iface);					\
-+	return res;							\
-+}
-+
-+/* Use this, if you are going to turn a [name] in the vlan struct on or off */
-+#define BATADV_ATTR_HIF_BOOL(_name, _mode, _post_func)			\
-+	static BATADV_ATTR_HIF_STORE_BOOL(_name, _post_func)		\
-+	static BATADV_ATTR_HIF_SHOW_BOOL(_name)				\
-+	static BATADV_ATTR_HIF(_name, _mode, batadv_show_hif_##_name,	\
-+			       batadv_store_hif_##_name)
-+
- static int batadv_store_bool_attr(char *buff, size_t count,
- 				  struct net_device *net_dev,
- 				  const char *attr_name, atomic_t *attr,
-@@ -993,6 +1050,7 @@ static ssize_t batadv_show_throughput_override(struct kobject *kobj,
- static BATADV_ATTR(mesh_iface, S_IRUGO | S_IWUSR, batadv_show_mesh_iface,
- 		   batadv_store_mesh_iface);
- static BATADV_ATTR(iface_status, S_IRUGO, batadv_show_iface_status, NULL);
-+BATADV_ATTR_HIF_BOOL(no_rebroadcast, S_IRUGO | S_IWUSR, NULL);
- #ifdef CONFIG_BATMAN_ADV_BATMAN_V
- BATADV_ATTR_HIF_UINT(elp_interval, bat_v.elp_interval, S_IRUGO | S_IWUSR,
- 		     2 * BATADV_JITTER, INT_MAX, NULL);
-@@ -1004,6 +1062,7 @@ static BATADV_ATTR(throughput_override, S_IRUGO | S_IWUSR,
- static struct batadv_attribute *batadv_batman_attrs[] = {
- 	&batadv_attr_mesh_iface,
- 	&batadv_attr_iface_status,
-+	&batadv_attr_hif_no_rebroadcast,
- #ifdef CONFIG_BATMAN_ADV_BATMAN_V
- 	&batadv_attr_elp_interval,
- 	&batadv_attr_throughput_override,
-diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
-index ba846b0..1a596c5 100644
---- a/net/batman-adv/types.h
-+++ b/net/batman-adv/types.h
-@@ -156,6 +156,7 @@ struct batadv_hard_iface {
- 	struct hlist_head neigh_list;
- 	/* neigh_list_lock protects: neigh_list */
- 	spinlock_t neigh_list_lock;
-+	atomic_t no_rebroadcast;
- };
- 
- /**
--- 
-2.8.3
-
diff --git a/1002-batman-adv-decrease-maximum-fragment-size.patch b/1002-batman-adv-decrease-maximum-fragment-size.patch
deleted file mode 100644
index a97146beb82d..000000000000
--- a/1002-batman-adv-decrease-maximum-fragment-size.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9e7384fde3c5a71f733221a137fdc4593a9638be Mon Sep 17 00:00:00 2001
-Message-Id: <9e7384fde3c5a71f733221a137fdc4593a9638be.1466048916.git.mschiffer@universe-factory.net>
-In-Reply-To: <8e4c2084bbf2a65ad663a2b1ba27144e5dadfd5f.1466048916.git.mschiffer@universe-factory.net>
-References: <8e4c2084bbf2a65ad663a2b1ba27144e5dadfd5f.1466048916.git.mschiffer@universe-factory.net>
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 6 Aug 2015 22:27:01 +0200
-Subject: [PATCH 2/2] batman-adv: decrease maximum fragment size
-
----
- net/batman-adv/main.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
-index 7692526..d314e6c 100644
---- a/net/batman-adv/main.h
-+++ b/net/batman-adv/main.h
-@@ -159,7 +159,7 @@ enum batadv_uev_type {
- /* Maximum number of fragments for one packet */
- #define BATADV_FRAG_MAX_FRAGMENTS 16
- /* Maxumim size of each fragment */
--#define BATADV_FRAG_MAX_FRAG_SIZE 1400
-+#define BATADV_FRAG_MAX_FRAG_SIZE 1280
- /* Time to keep fragments while waiting for rest of the fragments */
- #define BATADV_FRAG_TIMEOUT 10000
- 
--- 
-2.8.3
-
diff --git a/PKGBUILD b/PKGBUILD
index bc698b2fea38..bdb757100c27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Thomas Weißschuh <thomas t-8ch de>
+# Maintainer: RubenKelevra <ruben@vfn-nrw.de>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=batman-adv
-pkgver=2016.4
+pkgver=2017.0.1
 pkgrel=0
 epoch=1
 pkgdesc='batman kernel module'
@@ -12,12 +13,13 @@ license=('GPL')
 install='batman-adv.install'
 source=("https://downloads.open-mesh.org/batman/releases/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'batman-adv.install'
-        '1001-batman-adv-introduce-no_rebroadcast-option.patch'
-        '1002-batman-adv-decrease-maximum-fragment-size.patch'
 )
 depends=('linux')
 makedepends=('linux-headers')
 
+sha256sums=('55c2bc9739c5ef13d6951705431a3bcc4b9e5686be9c8d742923d1149f04c47c'
+            '347599c02426a905690002885c277f91b82da2b29d3372348e5f02d03c435c37')
+
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
@@ -41,7 +43,3 @@ package() {
   install -D -m644 README "${pkgdir}/usr/share/doc/batman-adv/README"
 }
 
-sha256sums=('bc1236dd83209db51a09368b7ed1dd3a1ce5f5b933e09260c4d6f107c0a150eb'
-            '347599c02426a905690002885c277f91b82da2b29d3372348e5f02d03c435c37'
-            'f86ba376f8563b9eb2e040fad8282949d4c61413fced068204a8de0523392c1f'
-            '1501d6fef6497461d2439505eeeb264f02f2ecfb06e7101908d72fc4d1953c14')