Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / ipv6 / ndisc.c

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 76ef4353d51872c1688b52531eadf1f4f446a8a4..2712ab22a174087c09cc705e1f6adec2bd601154 100644 (file)
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -610,8 +610,6 @@ void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr,
                }
        }
 #endif
-       if (!dev->addr_len)
-               send_sllao = 0;
        if (send_sllao)
                optlen += ndisc_opt_addr_space(dev);