From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Wed, 22 May 2013 22:00:32 +0000 (+0200)
Subject: Merge commit 'cd3b02d198093abbbe671f647e4deb2470eb9cf1' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6679f15ef3a89a6fb502d89d171981df55da085d;p=thirdparty%2Fbird.git

Merge commit 'cd3b02d198093abbbe671f647e4deb2470eb9cf1' into integrated
---

6679f15ef3a89a6fb502d89d171981df55da085d
diff --cc nest/iface.c
index 1664670e4,b4ab70c3a..d3d014164
--- a/nest/iface.c
+++ b/nest/iface.c
@@@ -600,14 -600,14 +600,6 @@@ if_choose_router_id(struct iface_patt *
  	  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;