Merge commit '280daed5' into thread-merge-2.16

diff --cc nest/neighbor.c
index a477235ecd4ed08d2320b7bfffe2e6703471e8e1,63c07f83f800235d62cdb7a1a67b3ad14cb13d19..4796419b1759a36c3398cbc8ce86a3f2c58d3ef3
--- 1/nest/neighbor.c
--- 2/nest/neighbor.c
+++ b/nest/neighbor.c
@@@ -232,11 -217,9 +232,12 @@@ neigh_find(struct proto *p, ip_addr a, 
    struct ifa *addr = NULL;
  
    WALK_LIST(n, neigh_hash_table[h])   /* Search the cache */
-     if ((n->proto == p) && ipa_equal(n->addr, a) && (n->ifreq == iface))
+     if ((n->proto == p) && ipa_equal(n->addr, a) && (n->ifreq == iface) &&
+       ((n->flags & NEF_ONLINK) == (flags & NEF_ONLINK)))
 +    {
 +      IFACE_UNLOCK;
        return n;
 +    }
  
    if (flags & NEF_IFACE)
    {

diff --cc proto/ospf/ospf.h
Simple merge

diff --cc proto/ospf/rt.c
Simple merge

diff --cc proto/ospf/topology.c
Simple merge