diff --git a/[refs] b/[refs] index e7bc0b975813..b506d9f77aac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c85c21ad1fe18daf26bfe8684df974d88cec50b7 +refs/heads/master: a7563f342db6490e66dbf2c8a50577a72a158c9a diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c index 7d7f30697ead..92be12bb8d23 100644 --- a/trunk/net/ipv6/route.c +++ b/trunk/net/ipv6/route.c @@ -125,8 +125,7 @@ static inline const void *choose_neigh_daddr(struct rt6_info *rt, const void *da { struct in6_addr *p = &rt->rt6i_gateway; - if (p->s6_addr32[0] | p->s6_addr32[1] | - p->s6_addr32[2] | p->s6_addr32[3]) + if (!ipv6_addr_any(p)) return (const void *) p; return daddr; }