The following commit has been merged in the merge/master branch: commit c1c28d6d8cf31666cea40dbf5ee5bf65c1f3c40a Merge: 58ad6a50d49f703efc4b19f52256bf3c31113c0b 4230486765c9a23321811149aaf081d38fd09b3c Author: Antonio Quartulli ordex@autistici.org Date: Mon Mar 4 09:23:09 2013 +0100
Merge remote-tracking branch 'pkg/maint' into merge/master
Signed-off-by: Antonio Quartulli ordex@autistici.org
Conflicts: net/batman-adv/CHANGELOG net/batman-adv/Makefile.kbuild net/batman-adv/README.external
diff --combined net/batman-adv/Makefile index e45e3b4,9beebf0..9beebf0 --- a/net/batman-adv/Makefile +++ b/net/batman-adv/Makefile @@@ -1,5 -1,5 +1,5 @@@ # - # Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: + # Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # diff --combined net/batman-adv/distributed-arp-table.c index ea0bd31,761a590..761a590 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@@ -440,7 -440,7 +440,7 @@@ static bool batadv_is_orig_node_eligibl /* this is an hash collision with the temporary selected node. Choose * the one with the lowest address */ - if ((tmp_max == max) && + if ((tmp_max == max) && max_orig_node && (batadv_compare_eth(candidate->orig, max_orig_node->orig) > 0)) goto out;