From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Tue, 29 Apr 2014 14:40:23 +0000 (+0200)
Subject: Merge commit '300e4008f02382b87409dabb52a317b8336de55b' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91ea1b134be8fa7c8e60296301758ff1a36981c7;p=thirdparty%2Fbird.git

Merge commit '300e4008f02382b87409dabb52a317b8336de55b' into integrated

Conflicts:

	nest/neighbor.c
---

91ea1b134be8fa7c8e60296301758ff1a36981c7
diff --cc nest/neighbor.c
index 64e907efc,48b6b6ac8..aba2338cf
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@@ -79,7 -85,11 +85,10 @@@ if_connected(ip_addr *a, struct iface *
  	      if ((b->pxlen < (BITS_PER_IP_ADDRESS - 1)) &&
  		  (ipa_equal(*a, b->prefix) ||	/* Network address */
  		   ipa_equal(*a, b->brd)))	/* Broadcast */
+ 	      {
+ 		*ap = NULL;
  		return -1;
+ 	      }
 -#endif
  
  	      return b->scope;
  	    }