2 files changed, 5 insertions, 3 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 647e6cba237d..3513cceba50a 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1803,7 +1803,7 @@ static struct inet6_dev *addrconf_add_dev(struct net_device *dev)
         return idev;
 }
 
-void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len)
+void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao)
 {
         struct prefix_info *pinfo;
         __u32 valid_lft;
@@ -1934,7 +1934,7 @@ ok:
 
 #ifdef CONFIG_IPV6_OPTIMISTIC_DAD
                         if (in6_dev->cnf.optimistic_dad &&
-                            !net->ipv6.devconf_all->forwarding)
+                            !net->ipv6.devconf_all->forwarding && sllao)
                                 addr_flags = IFA_F_OPTIMISTIC;
 #endif
 
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 3b1fe4b3f3c6..d8f02ef88e59 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1368,7 +1368,9 @@ skip_routeinfo:
                 for (p = ndopts.nd_opts_pi;
                      p;
                      p = ndisc_next_option(p, ndopts.nd_opts_pi_end)) {
-                        addrconf_prefix_rcv(skb->dev, (u8*)p, (p->nd_opt_len) << 3);
+                        addrconf_prefix_rcv(skb->dev, (u8 *)p,
+                                            (p->nd_opt_len) << 3,
+                                            ndopts.nd_opts_src_lladdr != NULL);
                 }
         }