From: Maria Matejka <mq@ucw.cz>
Date: Thu, 28 Nov 2024 08:02:59 +0000 (+0100)
Subject: Merge commit '280daed5' into thread-merge-2.16
X-Git-Tag: v3.0.0~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=402d07bccdf04693718cf2a40b345dd281337a0c;p=thirdparty%2Fbird.git

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

402d07bccdf04693718cf2a40b345dd281337a0c
diff --cc nest/neighbor.c
index a477235ec,63c07f83f..4796419b1
--- a/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)
    {