diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-16 02:11:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-16 02:11:14 -0500 |
| commit | b26e478f8fd5b575684f021b05a5c6236ebb911a (patch) | |
| tree | 27d3b3eaf3fe10d05319ad3395b2569ad5f8f6d0 /net/ipv6/route.c | |
| parent | bcebcc468a6bcd3820fe9ad36b34220563efc93a (diff) | |
| parent | bb3c36863e8001fc21a88bebfdead4da4c23e848 (diff) | |
| download | op-kernel-dev-b26e478f8fd5b575684f021b05a5c6236ebb911a.zip op-kernel-dev-b26e478f8fd5b575684f021b05a5c6236ebb911a.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
net/batman-adv/translation-table.c
net/ipv6/route.c
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 4bf362b..ad43854 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -728,7 +728,7 @@ static struct rt6_info *rt6_alloc_cow(const struct rt6_info *ort, int attempts = !in_softirq(); if (!(rt->rt6i_flags & RTF_GATEWAY)) { - if (rt->rt6i_dst.plen != 128 && + if (ort->rt6i_dst.plen != 128 && ipv6_addr_equal(&ort->rt6i_dst.addr, daddr)) rt->rt6i_flags |= RTF_ANYCAST; rt->rt6i_gateway = *daddr; |
