The following commit has been merged in the merge/master branch: commit 3e51b89dc683c8814ac06410e9b0aaff660148ed Merge: 4e4c770352f96df09cb2c336bb3fe6ea9d8beaf4 e8f5746f6d638d2e9e08596f312652dbe453284f Author: Antonio Quartulli ordex@autistici.org Date: Mon Nov 19 08:52:19 2012 +0100

Merge remote-tracking branch 'pkg/next' into merge/master

diff --combined net/batman-adv/bridge_loop_avoidance.c index fc56ea2,5aebe93..5aebe93 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@@ -79,7 -79,7 +79,7 @@@ static int batadv_compare_backbone_gw(c hash_entry); const struct batadv_backbone_gw *gw1 = data1, *gw2 = data2;

- if (memcmp(gw1->orig, gw2->orig, ETH_ALEN)) + if (!batadv_compare_eth(gw1->orig, gw2->orig)) return 0;

if (gw1->vid != gw2->vid) @@@ -96,7 -96,7 +96,7 @@@ static int batadv_compare_claim(const s hash_entry); const struct batadv_claim *cl1 = data1, *cl2 = data2;

- if (memcmp(cl1->addr, cl2->addr, ETH_ALEN)) + if (!batadv_compare_eth(cl1->addr, cl2->addr)) return 0;

if (cl1->vid != cl2->vid)