commits November 2014

commits@lists.open-mesh.org

1 participants
63 discussions

[batman-adv] next: Merge branch 'maint' into next (ea96df5)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit ea96df5e8cebbd835cbbe827660365197a1828c9 Merge: 8353fd1 1e4a96a Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Nov 9 12:34:03 2014 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- ea96df5e8cebbd835cbbe827660365197a1828c9 compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

8 years, 4 months

[batman-adv] maint: batman-adv: Fix double fetch in RCU version of hlist_*entry* (1e4a96a)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 1e4a96a4cfdfdf57fecacf1c8fa493345a9fcc03 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 3 23:16:19 2014 +0100 batman-adv: Fix double fetch in RCU version of hlist_*entry* The backported (<3.9) version of hlist_for_each_entry_rcu and hlist_for_each_entry_safe uses the new macro hlist_entry_safe. It is called with an ACCESS_ONCE parameter for the first parameter ptr. This disallows merging of the two loads which the current version of the macro uses. This is problematic because this macro must only generate one load. Otherwise with two contexts (or CPUs) following could happen: 1. context 1 fetches the ptr to the last entry in hlist_entry_safe() and accepts this non-NULL ptr 2. context 2 deletes the last entry and terminates the list with NULL 3. context 1 re-fetches the pointer, doesn't check for zero, calculates the entry based on a NULL pointer 4. context 1 crashes because it tries to load/write data from/to the invalid address Instead use a single load to a temporary variable and do the NULL-check and calculation based on that one. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 1e4a96a4cfdfdf57fecacf1c8fa493345a9fcc03 compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compat.h b/compat.h index 5eb5fe6..79ba39b 100644 --- a/compat.h +++ b/compat.h @@ -345,7 +345,9 @@ static int __batadv_interface_tx(struct sk_buff *skb, \ dev->master;\ }) #define hlist_entry_safe(ptr, type, member) \ - (ptr) ? hlist_entry(ptr, type, member) : NULL + ({ typeof(ptr) ____ptr = (ptr); \ + ____ptr ? hlist_entry(____ptr, type, member) : NULL; \ + }) #undef hlist_for_each_entry #define hlist_for_each_entry(pos, head, member) \

8 years, 4 months

[batman-adv] master's head updated: Merge branch 'next' (99aed11)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 8353fd1 list: fix order of arguments for hlist_add_after(_rcu) 99aed11 Merge branch 'next'

8 years, 4 months

[batman-adv] master: Merge branch 'next' (99aed11)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 99aed11d7c0e2c09bbc5f53fc5053aa47dcf6fbe Merge: 47dc789 8353fd1 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Nov 9 12:32:32 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- 99aed11d7c0e2c09bbc5f53fc5053aa47dcf6fbe compat.h | 6 ++++++ fragmentation.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

8 years, 4 months

[batman-adv] next: list: fix order of arguments for hlist_add_after(_rcu) (8353fd1)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 8353fd1a6d4216a027c75fc3bb73b08ad1d55ef3 Author: Ken Helias <kenhelias(a)firemail.de> Date: Fri Aug 15 13:38:47 2014 +0200 list: fix order of arguments for hlist_add_after(_rcu) All other add functions for lists have the new item as first argument and the position where it is added as second argument. This was changed for no good reason in this function and makes using it unnecessary confusing. The name was changed to hlist_add_behind() to cause unconverted code to generate a compile error instead of using the wrong parameter order. [akpm(a)linux-foundation.org: coding-style fixes] Signed-off-by: Ken Helias <kenhelias(a)firemail.de> Cc: "Paul E. McKenney" <paulmck(a)linux.vnet.ibm.com> Acked-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com> [intel driver bits] Cc: Hugh Dickins <hughd(a)google.com> Cc: Christoph Hellwig <hch(a)infradead.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> [sven(a)narfation.org: fix parameter order, add compat code] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 8353fd1a6d4216a027c75fc3bb73b08ad1d55ef3 compat.h | 6 ++++++ fragmentation.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/compat.h b/compat.h index ed5b815..eb837ae 100644 --- a/compat.h +++ b/compat.h @@ -446,4 +446,10 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #endif /* < KERNEL_VERSION(3, 16, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) + +#define hlist_add_behind(n, prev) hlist_add_after(prev, n) + +#endif /* < KERNEL_VERSION(3, 17, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/fragmentation.c b/fragmentation.c index 022d18a..fc1835c 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -188,7 +188,7 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, /* Reached the end of the list, so insert after 'frag_entry_last'. */ if (likely(frag_entry_last)) { - hlist_add_after(&frag_entry_last->list, &frag_entry_new->list); + hlist_add_behind(&frag_entry_new->list, &frag_entry_last->list); chain->size += skb->len - hdr_size; chain->timestamp = jiffies; ret = true;

8 years, 4 months

[batman-adv] master: batman-adv: fix and simplify condition when bonding should be used (47dc789)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 47dc789e7f949b74eef810ca3b48dd2fac0402bf Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Aug 13 14:26:56 2014 +0200 batman-adv: fix and simplify condition when bonding should be used The current condition actually does NOT consider bonding when the interface the packet came in from is the soft interface, which is the opposite of what it should do (and the comment describes). Fix that and slightly simplify the condition. Reported-by: Ray Gibson <booray(a)gmail.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 47dc789e7f949b74eef810ca3b48dd2fac0402bf routing.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/routing.c b/routing.c index 3a6764d..139d2f6 100644 --- a/routing.c +++ b/routing.c @@ -442,11 +442,13 @@ batadv_find_router(struct batadv_priv *bat_priv, router = batadv_orig_router_get(orig_node, recv_if); + if (!router) + return router; + /* only consider bonding for recv_if == BATADV_IF_DEFAULT (first hop) * and if activated. */ - if (recv_if == BATADV_IF_DEFAULT || !atomic_read(&bat_priv->bonding) || - !router) + if (!(recv_if == BATADV_IF_DEFAULT && atomic_read(&bat_priv->bonding))) return router; /* bonding: loop through the list of possible routers found

8 years, 4 months

[batctl] master: batctl: checkpatch - Please use a blank line after declarations (4f29a4f)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 4f29a4fa34fee4ff323ba75f947b76cbf92307f9 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Mon Sep 1 14:37:27 2014 +0200 batctl: checkpatch - Please use a blank line after declarations Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 4f29a4fa34fee4ff323ba75f947b76cbf92307f9 packet.h | 1 + 1 file changed, 1 insertion(+) diff --git a/packet.h b/packet.h index 34e096d..facd1fe 100644 --- a/packet.h +++ b/packet.h @@ -198,6 +198,7 @@ struct batadv_bla_claim_dst { uint8_t type; /* bla_claimframe */ __be16 group; /* group id */ }; + #pragma pack() /**

8 years, 4 months

[linux-merge]linux integration; annotated tag, v3.18-rc3, created. v3.18-rc3

by postmaster＠open-mesh.org

The annotated tag, v3.18-rc3 has been created at 9661ddfd3ad0bb4cee8ec6659331271eec7bd738 (tag) tagging 0df1f2487d2f0d04703f142813d53615d62a1da4 (commit) replaces v3.18-rc2 tagged by Linus Torvalds on Sun Nov 2 15:02:13 2014 -0800 - Shortlog ------------------------------------------------------------ Linux 3.18-rc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUVrf1AAoJEHm+PkMAQRiGtUkH/RX941uLQo0V+K0dy6LKD+Dv YmdmS7wQQ/Y5ji+qaaMgpqS1Fcjh7q1qXLSCstxiU42xVsulFKF1iA4fbesdmUvN zrtRYFCDPH2s0dycRfui9EW0ss/Bb3/l2aiRdpyzMBgwHa3Em2z74CdY9EPYkePW zozrNSwSt+iTSw9sg9SdaBiayV+jlFwJ+pgpjUccpRz3Ob7z5LlYtuLk4pITtFuw hc00bdCeduD0UJ3NC7WLS4USH5ZXZLkNB+OoteUw6srPUiDeaG0LefdV4D4J1eKe dcUXgoCMAqqc3a4PybC0sYBGumJmdaQwNVkh7RBLwUkQ0zjiuvbNcjSYfTG2yFs= =vR5Z -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

8 years, 4 months

[batman-adv] master: batman-adv: checkpatch - remove unnecessary parentheses (dac27f8)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit dac27f80c3725434050c0238f8b6930e85283c16 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Mon Sep 1 14:37:29 2014 +0200 batman-adv: checkpatch - remove unnecessary parentheses Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- dac27f80c3725434050c0238f8b6930e85283c16 bat_iv_ogm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 4dd7c40..00e00e0 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -878,7 +878,7 @@ batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface) hlist_for_each_entry_rcu(orig_node, head, hash_entry) { spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); word_index = hard_iface->if_num * BATADV_NUM_WORDS; - word = &(orig_node->bat_iv.bcast_own[word_index]); + word = &orig_node->bat_iv.bcast_own[word_index]; batadv_bit_get_packet(bat_priv, word, 1, 0); if_num = hard_iface->if_num; @@ -1663,7 +1663,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, offset = if_num * BATADV_NUM_WORDS; spin_lock_bh(&orig_neigh_node->bat_iv.ogm_cnt_lock); - word = &(orig_neigh_node->bat_iv.bcast_own[offset]); + word = &orig_neigh_node->bat_iv.bcast_own[offset]; bit_pos = if_incoming_seqno - 2; bit_pos -= ntohl(ogm_packet->seqno); batadv_set_bit(word, bit_pos);

8 years, 4 months

[batman-adv] master: batman-adv: checkpatch - Please don't use multiple blank lines (873d798)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 873d798c7769eb1f26504af3410853a388b16767 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Mon Sep 1 14:37:28 2014 +0200 batman-adv: checkpatch - Please don't use multiple blank lines Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 873d798c7769eb1f26504af3410853a388b16767 bat_iv_ogm.c | 2 -- bitarray.c | 1 - bridge_loop_avoidance.c | 7 ------- fragmentation.c | 1 - main.c | 1 - originator.c | 1 - originator.h | 1 - routing.c | 1 - soft-interface.c | 1 - sysfs.c | 1 - translation-table.c | 1 - 11 files changed, 18 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 73209f3..4dd7c40 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -26,7 +26,6 @@ #include "bat_algo.h" #include "network-coding.h" - /** * enum batadv_dup_status - duplicate status * @BATADV_NO_DUP: the packet is a duplicate @@ -1362,7 +1361,6 @@ out: return ret; } - /** * batadv_iv_ogm_process_per_outif - process a batman iv OGM for an outgoing if * @skb: the skb containing the OGM diff --git a/bitarray.c b/bitarray.c index 9586750..e3da07a 100644 --- a/bitarray.c +++ b/bitarray.c @@ -29,7 +29,6 @@ static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n) bitmap_shift_left(seq_bits, seq_bits, n, BATADV_TQ_LOCAL_WINDOW_SIZE); } - /* receive and process one packet within the sequence number window. * * returns: diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 0f0ca43..4fc6cab 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -69,7 +69,6 @@ static inline uint32_t batadv_choose_backbone_gw(const void *data, return hash % size; } - /* compares address and vid of two backbone gws */ static int batadv_compare_backbone_gw(const struct hlist_node *node, const void *data2) @@ -662,7 +661,6 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, if (unlikely(!backbone_gw)) return 1; - /* handle as ANNOUNCE frame */ backbone_gw->lasttime = jiffies; crc = ntohs(*((__be16 *)(&an_addr[4]))); @@ -849,7 +847,6 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv, return 2; } - /** * batadv_bla_process_claim * @bat_priv: the bat priv with all the soft interface information @@ -1347,8 +1344,6 @@ out: return ret; } - - /** * batadv_bla_is_backbone_gw_orig * @bat_priv: the bat priv with all the soft interface information @@ -1390,7 +1385,6 @@ bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig, return false; } - /** * batadv_bla_is_backbone_gw * @skb: the frame to be checked @@ -1480,7 +1474,6 @@ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, if (!atomic_read(&bat_priv->bridge_loop_avoidance)) goto allow; - if (unlikely(atomic_read(&bat_priv->bla.num_requests))) /* don't allow broadcasts while requests are in flight */ if (is_multicast_ether_addr(ethhdr->h_dest) && is_bcast) diff --git a/fragmentation.c b/fragmentation.c index 022d18a..022156d 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -23,7 +23,6 @@ #include "hard-interface.h" #include "soft-interface.h" - /** * batadv_frag_clear_chain - delete entries in the fragment buffer chain * @head: head of chain with entries. diff --git a/main.c b/main.c index 2cdd25a..d4079cd 100644 --- a/main.c +++ b/main.c @@ -41,7 +41,6 @@ #include "network-coding.h" #include "fragmentation.h" - /* List manipulations on hardif_list have to be rtnl_lock()'ed, * list traversals just rcu-locked */ diff --git a/originator.c b/originator.c index 6a48451..6c65c54 100644 --- a/originator.c +++ b/originator.c @@ -799,7 +799,6 @@ batadv_purge_orig_ifinfo(struct batadv_priv *bat_priv, return ifinfo_purged; } - /** * batadv_purge_orig_neighbors - purges neighbors from originator * @bat_priv: the bat priv with all the soft interface information diff --git a/originator.h b/originator.h index db3a9ed..aa4a436 100644 --- a/originator.h +++ b/originator.h @@ -70,7 +70,6 @@ batadv_orig_node_vlan_get(struct batadv_orig_node *orig_node, unsigned short vid); void batadv_orig_node_vlan_free_ref(struct batadv_orig_node_vlan *orig_vlan); - /* hashfunction to choose an entry in a hash table of given size * hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ diff --git a/routing.c b/routing.c index 35f76f2..3a6764d 100644 --- a/routing.c +++ b/routing.c @@ -292,7 +292,6 @@ out: return ret; } - int batadv_recv_icmp_packet(struct sk_buff *skb, struct batadv_hard_iface *recv_if) { diff --git a/soft-interface.c b/soft-interface.c index 9bf382d..ea80e6d 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -36,7 +36,6 @@ #include "bridge_loop_avoidance.h" #include "network-coding.h" - static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd); static void batadv_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info); diff --git a/sysfs.c b/sysfs.c index fc47baa..a63c3eb 100644 --- a/sysfs.c +++ b/sysfs.c @@ -151,7 +151,6 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \ static BATADV_ATTR(_name, _mode, batadv_show_##_name, \ batadv_store_##_name) - #define BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func) \ ssize_t batadv_store_##_name(struct kobject *kobj, \ struct attribute *attr, char *buff, \ diff --git a/translation-table.c b/translation-table.c index 38a804e..84e6f01 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1780,7 +1780,6 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv, batadv_tt_global_del_roaming(bat_priv, tt_global_entry, orig_node, message); - out: if (tt_global_entry) batadv_tt_global_entry_free_ref(tt_global_entry);

8 years, 4 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2014