From 11bffa59db923e976587cfa981ee4d95d1307e5b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 6 Aug 2015 22:31:28 +0200 Subject: [PATCH] Update routing packages This also updates batman-adv & alfred to 2015.1 --- modules | 2 +- .../0001-alfred-adjust-intervals.patch | 4 +- ...-adv-introduce-no_rebroadcast-option.patch | 86 +++++++++---------- ...n-adv-decrease-maximum-fragment-size.patch | 20 ++++- 4 files changed, 62 insertions(+), 50 deletions(-) diff --git a/modules b/modules index 0c5b9bab..e20e49b6 100644 --- a/modules +++ b/modules @@ -11,7 +11,7 @@ PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_COMMIT=881036e1f2818d2f0f0a8a72bfdb9c59e67b0e48 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git -PACKAGES_ROUTING_COMMIT=7d4e4fe21d6a7315c86fb070f2aac422f3334920 +PACKAGES_ROUTING_COMMIT=15b6598e575a852b1dd94aae6d323ba4683d50fe PACKAGES_LUCI_REPO=git://github.com/openwrt/luci.git PACKAGES_LUCI_COMMIT=3a7d738e2776e2ddaf6c127dbd9e2b90a77181d8 diff --git a/patches/packages/routing/0001-alfred-adjust-intervals.patch b/patches/packages/routing/0001-alfred-adjust-intervals.patch index c8773add..aabb1659 100644 --- a/patches/packages/routing/0001-alfred-adjust-intervals.patch +++ b/patches/packages/routing/0001-alfred-adjust-intervals.patch @@ -4,13 +4,13 @@ Subject: alfred: adjust intervals diff --git a/alfred/patches/0001-alfred-adjust-intervals.patch b/alfred/patches/0001-alfred-adjust-intervals.patch new file mode 100644 -index 0000000..a8e0b4d +index 0000000..df70eea --- /dev/null +++ b/alfred/patches/0001-alfred-adjust-intervals.patch @@ -0,0 +1,15 @@ +--- a/alfred.h ++++ b/alfred.h -+@@ -32,10 +32,10 @@ ++@@ -33,10 +33,10 @@ + #include "list.h" + #include "packet.h" + 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 5343997f..f4745ca3 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,15 +30,15 @@ index 632a209..01f567f 100644 } diff --git a/batman-adv/patches/1001-batman-adv-introduce-no_rebroadcast-option.patch b/batman-adv/patches/1001-batman-adv-introduce-no_rebroadcast-option.patch new file mode 100644 -index 0000000..9fc9426 +index 0000000..f461ddc --- /dev/null +++ b/batman-adv/patches/1001-batman-adv-introduce-no_rebroadcast-option.patch @@ -0,0 +1,172 @@ -+From 5ba3f1eac041857deabe39432fdfe1a584bbdd81 Mon Sep 17 00:00:00 2001 -+Message-Id: <5ba3f1eac041857deabe39432fdfe1a584bbdd81.1420645650.git.mschiffer@universe-factory.net> ++From a20c87779270f509227feecc4487e36a7d850c0f Mon Sep 17 00:00:00 2001 ++Message-Id: +From: =?UTF-8?q?Linus=20L=C3=BCssing?= +Date: Tue, 24 Sep 2013 04:36:27 +0200 -+Subject: [PATCH] batman-adv: introduce 'no_rebroadcast' option ++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 @@ -63,39 +63,15 @@ index 0000000..9fc9426 + +Signed-off-by: Linus Lüssing +--- -+ hard-interface.c | 2 ++ -+ send.c | 4 ++++ -+ sysfs-class-net-batman-adv | 10 ++++++++ -+ sysfs.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ -+ types.h | 1 + ++ .../ABI/testing/sysfs-class-net-batman-adv | 10 ++++ ++ 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, 76 insertions(+) + -+--- a/hard-interface.c -++++ b/hard-interface.c -+@@ -592,6 +592,8 @@ batadv_hardif_add_interface(struct net_d -+ /* extra reference for return */ -+ atomic_set(&hard_iface->refcount, 2); -+ -++ 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); -+ -+--- a/send.c -++++ b/send.c -+@@ -513,6 +513,10 @@ static void batadv_send_outstanding_bcas -+ 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; -++ -+ /* send a copy of the saved skb */ -+ skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC); -+ if (skb1) -+--- a/sysfs-class-net-batman-adv -++++ b/sysfs-class-net-batman-adv ++--- a/Documentation/ABI/testing/sysfs-class-net-batman-adv +++++ b/Documentation/ABI/testing/sysfs-class-net-batman-adv +@@ -13,3 +13,13 @@ Description: + displays the batman mesh interface this + currently is associated with. @@ -110,9 +86,33 @@ index 0000000..9fc9426 ++ 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! -+--- a/sysfs.c -++++ b/sysfs.c -+@@ -110,6 +110,17 @@ struct batadv_attribute batadv_attr_vlan ++--- a/net/batman-adv/hard-interface.c +++++ b/net/batman-adv/hard-interface.c ++@@ -639,6 +639,8 @@ batadv_hardif_add_interface(struct net_d ++ /* extra reference for return */ ++ atomic_set(&hard_iface->refcount, 2); ++ +++ 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); ++ ++--- a/net/batman-adv/send.c +++++ b/net/batman-adv/send.c ++@@ -531,6 +531,10 @@ static void batadv_send_outstanding_bcas ++ 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; +++ ++ /* send a copy of the saved skb */ ++ skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC); ++ if (skb1) ++--- a/net/batman-adv/sysfs.c +++++ b/net/batman-adv/sysfs.c ++@@ -129,6 +129,17 @@ struct batadv_attribute batadv_attr_vlan + .store = _store, \ + } + @@ -130,7 +130,7 @@ index 0000000..9fc9426 + /* Use this, if you have customized show and store functions */ + #define BATADV_ATTR(_name, _mode, _show, _store) \ + struct batadv_attribute batadv_attr_##_name = { \ -+@@ -220,6 +231,52 @@ ssize_t batadv_show_vlan_##_name(struct ++@@ -239,6 +250,52 @@ ssize_t batadv_show_vlan_##_name(struct + static BATADV_ATTR_VLAN(_name, _mode, batadv_show_vlan_##_name, \ + batadv_store_vlan_##_name) + @@ -183,7 +183,7 @@ index 0000000..9fc9426 + static int batadv_store_bool_attr(char *buff, size_t count, + struct net_device *net_dev, + const char *attr_name, atomic_t *attr) -+@@ -843,10 +900,12 @@ static ssize_t batadv_show_iface_status( ++@@ -863,10 +920,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); @@ -196,9 +196,9 @@ index 0000000..9fc9426 + NULL, + }; + -+--- a/types.h -++++ b/types.h -+@@ -101,6 +101,7 @@ struct batadv_hard_iface { ++--- a/net/batman-adv/types.h +++++ b/net/batman-adv/types.h ++@@ -115,6 +115,7 @@ struct batadv_hard_iface { + struct batadv_hard_iface_bat_iv bat_iv; + struct work_struct cleanup_work; + struct dentry *debug_dir; diff --git a/patches/packages/routing/0003-batman-adv-decrease-maximum-fragment-size.patch b/patches/packages/routing/0003-batman-adv-decrease-maximum-fragment-size.patch index 3ac4a6bf..e7b5580e 100644 --- a/patches/packages/routing/0003-batman-adv-decrease-maximum-fragment-size.patch +++ b/patches/packages/routing/0003-batman-adv-decrease-maximum-fragment-size.patch @@ -4,12 +4,24 @@ Subject: batman-adv: decrease maximum fragment size diff --git a/batman-adv/patches/1002-batman-adv-decrease-maximum-fragment-size.patch b/batman-adv/patches/1002-batman-adv-decrease-maximum-fragment-size.patch new file mode 100644 -index 0000000..a93b9fa +index 0000000..16cb023 --- /dev/null +++ b/batman-adv/patches/1002-batman-adv-decrease-maximum-fragment-size.patch -@@ -0,0 +1,11 @@ -+--- a/main.h -++++ b/main.h +@@ -0,0 +1,23 @@ ++From 02c861b6aa334dff1ce8031ffc328924c78beec1 Mon Sep 17 00:00:00 2001 ++Message-Id: <02c861b6aa334dff1ce8031ffc328924c78beec1.1438892883.git.mschiffer@universe-factory.net> ++In-Reply-To: ++References: ++From: Matthias Schiffer ++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(-) ++ ++--- a/net/batman-adv/main.h +++++ b/net/batman-adv/main.h +@@ -148,7 +148,7 @@ enum batadv_uev_type { + /* Maximum number of fragments for one packet */ + #define BATADV_FRAG_MAX_FRAGMENTS 16