Re: [PATCH 2/2] SUNRPC: compare scopeid for link-local addresses

["J. Bruce Fields" <bfields@fieldses.org>]

On Tue, Sep 13, 2011 at 03:45:24PM +0800, Mi Jinlong wrote:
> Hi guys:
> 
>   What's the situation about those two paths?

Apologies for the delay; both look reasonable to me, thanks.  Applying
for 3.2.  (May be a few days before I push it out to my public tree.)

--b.

> 
> 
> thanks,
> Mi Jinlong
> 
> Mi Jinlong:
> > For ipv6 link-local addresses, sunrpc do not compare those scope id.
> > This patch let sunrpc compares scope id only on link-local addresses.
> > 
> > Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
> > ---
> >  include/linux/sunrpc/clnt.h |    8 +++++++-
> >  1 files changed, 7 insertions(+), 1 deletions(-)
> > 
> > diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
> > index db7bcaf..ee1bb67 100644
> > --- a/include/linux/sunrpc/clnt.h
> > +++ b/include/linux/sunrpc/clnt.h
> > @@ -218,7 +218,13 @@ static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
> >  {
> >  	const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sap1;
> >  	const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
> > -	return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr);
> > +
> > +	if (!ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr))
> > +		return false;
> > +	else if (ipv6_addr_type(&sin1->sin6_addr) & IPV6_ADDR_LINKLOCAL)
> > +		return sin1->sin6_scope_id == sin2->sin6_scope_id;
> > +
> > +	return true;
> >  }
> >  
> >  static inline bool __rpc_copy_addr6(struct sockaddr *dst,
>