Merge tag 'v4.0-rc2' into irq/core, to refresh the tree before applying new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 682866777d53..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) {
@@ -1348,7 +1350,7 @@ skip_routeinfo:
                 }
         }
 
-        if (ndopts.nd_opts_mtu) {
+        if (ndopts.nd_opts_mtu && in6_dev->cnf.accept_ra_mtu) {
                 __be32 n;
                 u32 mtu;