From 6c378d17269849df1c64fa79e1c95e39ee806b40 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 15 Jun 2015 12:37:38 +0200
Subject: [PATCH] batman-adv: refresh no_rebroadcast patch to apply to 2015.0
cleanly
---
...-adv-introduce-no_rebroadcast-option.patch | 27 +++++--------------
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/patches/packages/routing/0002-batman-adv-introduce-no_rebroadcast-option.patch b/patches/packages/routing/0002-batman-adv-introduce-no_rebroadcast-option.patch
index c0e90d664..6022d3517 100644
--- a/patches/packages/routing/0002-batman-adv-introduce-no_rebroadcast-option.patch
+++ b/patches/packages/routing/0002-batman-adv-introduce-no_rebroadcast-option.patch
@@ -30,10 +30,10 @@ index 632a209..01f567f 100644
}
diff --git a/batman-adv/patches/0001-batman-adv-introduce-no_rebroadcast-option.patch b/batman-adv/patches/0001-batman-adv-introduce-no_rebroadcast-option.patch
new file mode 100644
-index 0000000..cd79917
+index 0000000..9fc9426
--- /dev/null
+++ b/batman-adv/patches/0001-batman-adv-introduce-no_rebroadcast-option.patch
-@@ -0,0 +1,185 @@
+@@ -0,0 +1,172 @@
+From 5ba3f1eac041857deabe39432fdfe1a584bbdd81 Mon Sep 17 00:00:00 2001
+Message-Id: <5ba3f1eac041857deabe39432fdfe1a584bbdd81.1420645650.git.mschiffer@universe-factory.net>
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@web.de>
@@ -70,11 +70,9 @@ index 0000000..cd79917
+ types.h | 1 +
+ 5 files changed, 76 insertions(+)
+
-+diff --git a/hard-interface.c b/hard-interface.c
-+index fbda6b5..3997f9c 100644
+--- a/hard-interface.c
++++ b/hard-interface.c
-+@@ -591,6 +591,8 @@ batadv_hardif_add_interface(struct net_device *net_dev)
++@@ -592,6 +592,8 @@ batadv_hardif_add_interface(struct net_d
+ /* extra reference for return */
+ atomic_set(&hard_iface->refcount, 2);
+
@@ -83,11 +81,9 @@ index 0000000..cd79917
+ batadv_check_known_mac_addr(hard_iface->net_dev);
+ list_add_tail_rcu(&hard_iface->list, &batadv_hardif_list);
+
-+diff --git a/send.c b/send.c
-+index d27161e..4383a66 100644
+--- a/send.c
++++ b/send.c
-+@@ -513,6 +513,10 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work)
++@@ -513,6 +513,10 @@ static void batadv_send_outstanding_bcas
+ if (forw_packet->num_packets >= hard_iface->num_bcasts)
+ continue;
+
@@ -98,8 +94,6 @@ index 0000000..cd79917
+ /* send a copy of the saved skb */
+ skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC);
+ if (skb1)
-+diff --git a/sysfs-class-net-batman-adv b/sysfs-class-net-batman-adv
-+index 7f34a95..cf7fe00 100644
+--- a/sysfs-class-net-batman-adv
++++ b/sysfs-class-net-batman-adv
+@@ -13,3 +13,13 @@ Description:
@@ -116,11 +110,9 @@ index 0000000..cd79917
++ 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/sysfs.c b/sysfs.c
-+index fc47baa..adaeca4 100644
+--- a/sysfs.c
++++ b/sysfs.c
-+@@ -110,6 +110,17 @@ struct batadv_attribute batadv_attr_vlan_##_name = { \
++@@ -110,6 +110,17 @@ struct batadv_attribute batadv_attr_vlan
+ .store = _store, \
+ }
+
@@ -138,7 +130,7 @@ index 0000000..cd79917
+ /* Use this, if you have customized show and store functions */
+ #define BATADV_ATTR(_name, _mode, _show, _store) \
+ struct batadv_attribute batadv_attr_##_name = { \
-+@@ -221,6 +232,52 @@ ssize_t batadv_show_vlan_##_name(struct kobject *kobj, \
++@@ -220,6 +231,52 @@ ssize_t batadv_show_vlan_##_name(struct
+ static BATADV_ATTR_VLAN(_name, _mode, batadv_show_vlan_##_name, \
+ batadv_store_vlan_##_name)
+
@@ -191,7 +183,7 @@ index 0000000..cd79917
+ static int batadv_store_bool_attr(char *buff, size_t count,
+ struct net_device *net_dev,
+ const char *attr_name, atomic_t *attr)
-+@@ -844,10 +901,12 @@ static ssize_t batadv_show_iface_status(struct kobject *kobj,
++@@ -843,10 +900,12 @@ static ssize_t batadv_show_iface_status(
+ 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);
@@ -204,8 +196,6 @@ index 0000000..cd79917
+ NULL,
+ };
+
-+diff --git a/types.h b/types.h
-+index 8854c05..39619fb 100644
+--- a/types.h
++++ b/types.h
+@@ -101,6 +101,7 @@ struct batadv_hard_iface {
@@ -216,6 +206,3 @@ index 0000000..cd79917
+ };
+
+ /**
-+--
-+2.2.1
-+
--
GitLab