update to batman-adv 2016.4 (removing patch for doc-files which dont apply anymore - patch 1001)

4 files changed, 9 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5d2f970dcd4a..dd9eac06f231 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Thu Jun 23 07:01:52 UTC 2016
 pkgbase = batman-adv
 	pkgdesc = batman kernel module
-	pkgver = 2016.2
+	pkgver = 2016.4
 	pkgrel = 0
 	epoch = 1
 	url = https://www.open-mesh.net/
@@ -12,15 +10,13 @@ pkgbase = batman-adv
 	license = GPL
 	makedepends = linux-headers
 	depends = linux
-	source = https://downloads.open-mesh.org/batman/releases/batman-adv-2016.2/batman-adv-2016.2.tar.gz
+	source = https://downloads.open-mesh.org/batman/releases/batman-adv-2016.4/batman-adv-2016.4.tar.gz
 	source = batman-adv.install
-	source = 0001-batman-adv-Fix-speedy-join-in-gateway-client-mode.patch
 	source = 1001-batman-adv-introduce-no_rebroadcast-option.patch
 	source = 1002-batman-adv-decrease-maximum-fragment-size.patch
-	sha256sums = 61521b3a4af216533850c2cdb7055b5f9c59eb3ce4849b55e2fd96a3ad92465e
+	sha256sums = bc1236dd83209db51a09368b7ed1dd3a1ce5f5b933e09260c4d6f107c0a150eb
 	sha256sums = 347599c02426a905690002885c277f91b82da2b29d3372348e5f02d03c435c37
-	sha256sums = b1425b0fa6268fc67b3f35b443c382d86ac0e8513b3f786a06695f90b36774ee
-	sha256sums = 7a876cccdb287fb9929cf1b33361334d78b6cd7cbb3f3fb0a3c9c261f335edaf
+	sha256sums = f86ba376f8563b9eb2e040fad8282949d4c61413fced068204a8de0523392c1f
 	sha256sums = 1501d6fef6497461d2439505eeeb264f02f2ecfb06e7101908d72fc4d1953c14
 
 pkgname = batman-adv
diff --git a/0001-batman-adv-Fix-speedy-join-in-gateway-client-mode.patch b/0001-batman-adv-Fix-speedy-join-in-gateway-client-mode.patch
deleted file mode 100644
index e63b782f4f82..000000000000
--- a/0001-batman-adv-Fix-speedy-join-in-gateway-client-mode.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sun, 12 Jun 2016 10:43:19 +0200
-Subject: [PATCH] batman-adv: Fix speedy join in gateway client mode
-
-Speedy join only works when the received packet is either broadcast or an
-4addr unicast packet. Thus packets converted from broadcast to unicast via
-the gateway handling code have to be converted to 4addr packets to allow
-the receiving gateway server to add the sender address as temporary entry
-to the translation table.
-
-Not doing it will make the batman-adv gateway server drop the DHCP response
-in many situations because it doesn't yet have the TT entry for the
-destination of the DHCP response.
-
-Fixes: 9cbc67d9da47 ("batman-adv: change interface_rx to get orig node")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
----
- net/batman-adv/send.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
-index f2f1256..0103976 100644
---- a/net/batman-adv/send.c
-+++ b/net/batman-adv/send.c
-@@ -424,8 +424,8 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,
- 	struct batadv_orig_node *orig_node;
- 
- 	orig_node = batadv_gw_get_selected_orig(bat_priv);
--	return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST, 0,
--				       orig_node, vid);
-+	return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST_4ADDR,
-+				       BATADV_P_DATA, orig_node, vid);
- }
- 
- void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface)
diff --git a/1001-batman-adv-introduce-no_rebroadcast-option.patch b/1001-batman-adv-introduce-no_rebroadcast-option.patch
index e9f5ffb4408f..80a99479d9d3 100644
--- a/1001-batman-adv-introduce-no_rebroadcast-option.patch
+++ b/1001-batman-adv-introduce-no_rebroadcast-option.patch
@@ -25,34 +25,13 @@ transitive, symmetric VPN configurations.
 Using this option wrongly will break your mesh network, use this option
 wisely and at your own risk!
 
-Signed-off-by: Linus Lüssing <linus.luessing@web.de>
 ---
- .../ABI/testing/sysfs-class-net-batman-adv         | 11 ++++
  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 +
- 5 files changed, 77 insertions(+)
+ 4 files changed
 
-diff --git a/Documentation/ABI/testing/sysfs-class-net-batman-adv b/Documentation/ABI/testing/sysfs-class-net-batman-adv
-index 518f6a1..896c480 100644
---- a/Documentation/ABI/testing/sysfs-class-net-batman-adv
-+++ b/Documentation/ABI/testing/sysfs-class-net-batman-adv
-@@ -28,3 +28,14 @@ Description:
-                 The /sys/class/net/<iface>/batman-adv/mesh_iface file
-                 displays the batman mesh interface this <iface>
-                 currently is associated with.
-+
-+What:           /sys/class/net/<iface>/batman-adv/no_rebroadcast
-+Date:           Sep 2013
-+Contact:        Linus Lüssing <linus.luessing@web.de>
-+Description:
-+                With this option set incoming multicast payload frames on
-+                <iface> are not being rebroadcasted on <iface> again. This
-+                option should be set on links which are known to be transitive
-+                and symmetric only, for instance point-to-point wifi longshots
-+                or wired links. Using this option wrongly is going to
-+                break your mesh network, use at your own risk!
 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
diff --git a/PKGBUILD b/PKGBUILD
index 58cebdb2a565..bc698b2fea38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=batman-adv
-pkgver=2016.2
+pkgver=2016.4
 pkgrel=0
 epoch=1
 pkgdesc='batman kernel module'
@@ -12,7 +12,6 @@ license=('GPL')
 install='batman-adv.install'
 source=("https://downloads.open-mesh.org/batman/releases/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'batman-adv.install'
-        '0001-batman-adv-Fix-speedy-join-in-gateway-client-mode.patch'
         '1001-batman-adv-introduce-no_rebroadcast-option.patch'
         '1002-batman-adv-decrease-maximum-fragment-size.patch'
 )
@@ -38,12 +37,11 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  install -D -m644 net/batman-adv/batman-adv.ko "${pkgdir}/usr/lib/modules/$(uname -r)/updates/net/batman-adv/batman_adv.ko"
+  install -D -m644 build/net/batman-adv/batman-adv.ko "${pkgdir}/usr/lib/modules/$(uname -r)/updates/net/batman-adv/batman_adv.ko"
   install -D -m644 README "${pkgdir}/usr/share/doc/batman-adv/README"
 }
 
-sha256sums=('61521b3a4af216533850c2cdb7055b5f9c59eb3ce4849b55e2fd96a3ad92465e'
+sha256sums=('bc1236dd83209db51a09368b7ed1dd3a1ce5f5b933e09260c4d6f107c0a150eb'
             '347599c02426a905690002885c277f91b82da2b29d3372348e5f02d03c435c37'
-            'b1425b0fa6268fc67b3f35b443c382d86ac0e8513b3f786a06695f90b36774ee'
-            '7a876cccdb287fb9929cf1b33361334d78b6cd7cbb3f3fb0a3c9c261f335edaf'
+            'f86ba376f8563b9eb2e040fad8282949d4c61413fced068204a8de0523392c1f'
             '1501d6fef6497461d2439505eeeb264f02f2ecfb06e7101908d72fc4d1953c14')