diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-07-02 13:05:10 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-07-02 13:05:10 +0900 |
| commit | 12462d77ec78be9fb033580b7b64ddf9d0fee44b (patch) | |
| tree | a21157428d46259ed2c8a727ac12a2e658d8181a /net/ipv6/ndisc.c | |
| parent | 598ee698d9db7beb06e12f4ea9d9a5fbc03a3a77 (diff) | |
| parent | 97e0214044d9f279a3d6286c9f859696ef0b7ebe (diff) | |
| download | blackbird-op-linux-12462d77ec78be9fb033580b7b64ddf9d0fee44b.tar.gz blackbird-op-linux-12462d77ec78be9fb033580b7b64ddf9d0fee44b.zip | |
Merge branches 'sh/highmem' and 'sh/stable-updates'
Diffstat (limited to 'net/ipv6/ndisc.c')
| -rw-r--r-- | net/ipv6/ndisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 0abdc242ddb7..2efef52fb461 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -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); |
