summaryrefslogtreecommitdiff
path: root/babeld/neighbour.c
diff options
context:
space:
mode:
authorMatthieu Boutier <boutier@pps.jussieu.fr>2012-01-23 23:46:32 +0100
committerPaul Jakma <paul@quagga.net>2012-03-25 17:06:53 +0100
commitc35fafdf887aa32c5be6ad738d3a3b0140cea6e8 (patch)
tree4aa21a41dcd82247e467e5b955a6f7813bfd7ba7 /babeld/neighbour.c
parent16e51b246be6b18641327685f44bd4f5f6649367 (diff)
babeld: babelz merge.
Babelz is the last version of the stand-alone babel daemon. In particular, it use multiple channels to diminuate interferences. Please refer to this one for more details.
Diffstat (limited to 'babeld/neighbour.c')
-rw-r--r--babeld/neighbour.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/babeld/neighbour.c b/babeld/neighbour.c
index f360b891..5a327dfe 100644
--- a/babeld/neighbour.c
+++ b/babeld/neighbour.c
@@ -122,7 +122,8 @@ find_neighbour(const unsigned char *address, struct interface *ifp)
return neigh;
}
-/* Recompute a neighbour's rxcost. Return true if anything changed. */
+/* Recompute a neighbour's rxcost. Return true if anything changed.
+ This does not call local_notify_neighbour, see update_neighbour_metric. */
int
update_neighbour(struct neighbour *neigh, int hello, int hello_interval)
{
@@ -327,7 +328,7 @@ neighbour_cost(struct neighbour *neigh)
return INFINITY;
if(!(babel_get_if_nfo(neigh->ifp)->flags & BABEL_IF_LQ)
- || (a <= 256 && b <= 256)) {
+ || (a < 256 && b < 256)) {
return a;
} else {
/* a = 256/alpha, b = 256/beta, where alpha and beta are the expected