From 7d14a9c5c566e8aef884495e29d220436fd0453e Mon Sep 17 00:00:00 2001 From: Pau Koning Date: Tue, 12 Feb 2013 00:18:45 +0000 Subject: [PATCH] --- yaml --- r: 349763 b: refs/heads/master c: 816cd5b83e4d8f3c8106966e64a025408caee3f6 h: refs/heads/master i: 349761: cbf906a927961dbdc38c245719651e93a9f3effb 349759: 671a3e698636e311709143a52275f14ca57cc14f v: v3 --- [refs] | 2 +- trunk/net/batman-adv/distributed-arp-table.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fcb7032dc400..fa0158850e26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8770e91aa61127f82eb8a9e641832474dbbcc8f1 +refs/heads/master: 816cd5b83e4d8f3c8106966e64a025408caee3f6 diff --git a/trunk/net/batman-adv/distributed-arp-table.c b/trunk/net/batman-adv/distributed-arp-table.c index 183f97a86bb2..553921511e4e 100644 --- a/trunk/net/batman-adv/distributed-arp-table.c +++ b/trunk/net/batman-adv/distributed-arp-table.c @@ -440,7 +440,7 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res, /* 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;