Repository : ssh://git@open-mesh.org/batman-adv

On branch : next

commit 8353fd1a6d4216a027c75fc3bb73b08ad1d55ef3 Author: Ken Helias kenhelias@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@linux-foundation.org: coding-style fixes] Signed-off-by: Ken Helias kenhelias@firemail.de Cc: "Paul E. McKenney" paulmck@linux.vnet.ibm.com Acked-by: Jeff Kirsher jeffrey.t.kirsher@intel.com [intel driver bits] Cc: Hugh Dickins hughd@google.com Cc: Christoph Hellwig hch@infradead.org Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org [sven@narfation.org: fix parameter order, add compat code] Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@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;