nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

batman-adv: refresh no_rebroadcast patch to apply to 2015.0 cleanly

Browse Source
This commit is contained in:
Matthias Schiffer 2015-06-15 12:37:38 +02:00
parent 3422f6f72b
commit 6c378d1726
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
patches/packages/routing/0002-batman-adv-introduce-no_rebroadcast-option.patch
View File

@ -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 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 new file mode 100644
index 0000000..cd79917 index 0000000..9fc9426
--- /dev/null --- /dev/null
+++ b/batman-adv/patches/0001-batman-adv-introduce-no_rebroadcast-option.patch +++ 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 +From 5ba3f1eac041857deabe39432fdfe1a584bbdd81 Mon Sep 17 00:00:00 2001
+Message-Id: <5ba3f1eac041857deabe39432fdfe1a584bbdd81.1420645650.git.mschiffer@universe-factory.net> +Message-Id: <5ba3f1eac041857deabe39432fdfe1a584bbdd81.1420645650.git.mschiffer@universe-factory.net>
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@web.de> +From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@web.de>
@ -70,11 +70,9 @@ index 0000000..cd79917
+ types.h | 1 + + types.h | 1 +
+ 5 files changed, 76 insertions(+) + 5 files changed, 76 insertions(+)
+ +
+diff --git a/hard-interface.c b/hard-interface.c
+index fbda6b5..3997f9c 100644
+--- a/hard-interface.c +--- a/hard-interface.c
++++ b/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 */ + /* extra reference for return */
+ atomic_set(&hard_iface->refcount, 2); + atomic_set(&hard_iface->refcount, 2);
+ +
@ -83,11 +81,9 @@ index 0000000..cd79917
+ batadv_check_known_mac_addr(hard_iface->net_dev); + batadv_check_known_mac_addr(hard_iface->net_dev);
+ list_add_tail_rcu(&hard_iface->list, &batadv_hardif_list); + 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 +--- a/send.c
++++ b/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) + if (forw_packet->num_packets >= hard_iface->num_bcasts)
+ continue; + continue;
+ +
@ -98,8 +94,6 @@ index 0000000..cd79917
+ /* send a copy of the saved skb */ + /* send a copy of the saved skb */
+ skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC); + skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC);
+ if (skb1) + 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 +--- a/sysfs-class-net-batman-adv
++++ b/sysfs-class-net-batman-adv ++++ b/sysfs-class-net-batman-adv
+@@ -13,3 +13,13 @@ Description: +@@ -13,3 +13,13 @@ Description:
@ -116,11 +110,9 @@ index 0000000..cd79917
++ and symmetric only, for instance point-to-point wifi longshots ++ and symmetric only, for instance point-to-point wifi longshots
++ or wired links. Using this option wrongly is going to ++ or wired links. Using this option wrongly is going to
++ break your mesh network, use at your own risk! ++ break your mesh network, use at your own risk!
+diff --git a/sysfs.c b/sysfs.c
+index fc47baa..adaeca4 100644
+--- a/sysfs.c +--- a/sysfs.c
++++ b/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, \ + .store = _store, \
+ } + }
+ +
@ -138,7 +130,7 @@ index 0000000..cd79917
+ /* Use this, if you have customized show and store functions */ + /* Use this, if you have customized show and store functions */
+ #define BATADV_ATTR(_name, _mode, _show, _store) \ + #define BATADV_ATTR(_name, _mode, _show, _store) \
+ struct batadv_attribute batadv_attr_##_name = { \ + 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, \ + static BATADV_ATTR_VLAN(_name, _mode, batadv_show_vlan_##_name, \
+ batadv_store_vlan_##_name) + batadv_store_vlan_##_name)
+ +
@ -191,7 +183,7 @@ index 0000000..cd79917
+ static int batadv_store_bool_attr(char *buff, size_t count, + static int batadv_store_bool_attr(char *buff, size_t count,
+ struct net_device *net_dev, + struct net_device *net_dev,
+ const char *attr_name, atomic_t *attr) + 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, + static BATADV_ATTR(mesh_iface, S_IRUGO | S_IWUSR, batadv_show_mesh_iface,
+ batadv_store_mesh_iface); + batadv_store_mesh_iface);
+ static BATADV_ATTR(iface_status, S_IRUGO, batadv_show_iface_status, NULL); + static BATADV_ATTR(iface_status, S_IRUGO, batadv_show_iface_status, NULL);
@ -204,8 +196,6 @@ index 0000000..cd79917
+ NULL, + NULL,
+ }; + };
+ +
+diff --git a/types.h b/types.h
+index 8854c05..39619fb 100644
+--- a/types.h +--- a/types.h
++++ b/types.h ++++ b/types.h
+@@ -101,6 +101,7 @@ struct batadv_hard_iface { +@@ -101,6 +101,7 @@ struct batadv_hard_iface {
@ -216,6 +206,3 @@ index 0000000..cd79917
+ }; + };
+ +
+ /** + /**
+--
+2.2.1
+