summaryrefslogtreecommitdiff
path: root/nest/iface.c
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2013-11-24 12:50:53 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2013-11-24 12:50:53 +0100
commite4d179f2c2f213c9190ff4d05979dc33f2c5b2c7 (patch)
tree200952bd5f59c4219c651790ed90600581ff5ebf /nest/iface.c
parentf3e59178506dab9d54cf19ec701f8d9a7fe283f9 (diff)
Minor changes to default router ID calculation.
Diffstat (limited to 'nest/iface.c')
-rw-r--r--nest/iface.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/nest/iface.c b/nest/iface.c
index b4ab70c3..298698a7 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -600,22 +600,10 @@ if_choose_router_id(struct iface_patt *mask, u32 old_id)
if (a->scope <= SCOPE_LINK)
continue;
- /* FIXME: This should go away */
- if (a->flags & IA_PEER)
- continue;
-
- /* FIXME: This should go away too */
- if (!mask && (a != i->addr))
- continue;
-
/* Check pattern if specified */
if (mask && !iface_patt_match(mask, i, a))
continue;
- /* FIXME: This should go away too */
- if ((i->flags & IF_IGNORE) && !mask)
- continue;
-
/* No pattern or pattern matched */
if (!b || ipa_to_u32(a->ip) < ipa_to_u32(b->ip))
b = a;