diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-09 14:35:57 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-09 14:35:57 -0800 |
| commit | 2573beec56aa28a0e6d4430fb6796d0c76308bcf (patch) | |
| tree | 15c902551b78a954d5138304b97a16a4d9968202 /net/ipv6/ndisc.c | |
| parent | fd3137cd33ae5590c45c81e9a46fe53b6ab5f66e (diff) | |
| parent | 531c94a9681b8c253fd0490a4ca8bbe01a38c78b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ndisc.c')
| -rw-r--r-- | net/ipv6/ndisc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 8a9d7c19e247..471ed24aabae 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -655,7 +655,9 @@ static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb) struct in6_addr *target = (struct in6_addr *)&neigh->primary_key; int probes = atomic_read(&neigh->probes); - if (skb && ipv6_chk_addr(dev_net(dev), &ipv6_hdr(skb)->saddr, dev, 1)) + if (skb && ipv6_chk_addr_and_flags(dev_net(dev), &ipv6_hdr(skb)->saddr, + dev, 1, + IFA_F_TENTATIVE|IFA_F_OPTIMISTIC)) saddr = &ipv6_hdr(skb)->saddr; probes -= NEIGH_VAR(neigh->parms, UCAST_PROBES); if (probes < 0) { |