|
@@ -586,6 +586,7 @@ static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,
|
|
|
src_addr = solicited_addr;
|
|
|
if (ifp->flags & IFA_F_OPTIMISTIC)
|
|
|
override = 0;
|
|
|
+ inc_opt |= ifp->idev->cnf.force_tllao;
|
|
|
in6_ifa_put(ifp);
|
|
|
} else {
|
|
|
if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
|
|
@@ -599,7 +600,6 @@ static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,
|
|
|
icmp6h.icmp6_solicited = solicited;
|
|
|
icmp6h.icmp6_override = override;
|
|
|
|
|
|
- inc_opt |= ifp->idev->cnf.force_tllao;
|
|
|
__ndisc_send(dev, neigh, daddr, src_addr,
|
|
|
&icmp6h, solicited_addr,
|
|
|
inc_opt ? ND_OPT_TARGET_LL_ADDR : 0);
|