From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Olsa Subject: Re: [PATCH] IPv6: fix Mobile IPv6 regression Date: Mon, 31 May 2010 14:49:02 +0200 Message-ID: <20100531124902.GE1929@jolsa.lab.eng.brq.redhat.com> References: <87zkzmppfg.fsf@small.ssi.corp> <4BFDC14F.6050407@hp.com> <8739xdqsuz.fsf@small.ssi.corp> <4BFECA65.7030102@hp.com> <4BFEE49C.8060301@lucent.com> <87hblss92x.fsf@small.ssi.corp> <4C00047D.3010404@hp.com> <4C0008C7.7020302@hp.com> <20100531084620.GB1929@jolsa.lab.eng.brq.redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: David Miller , Arnaud Ebalard , Scott C Otto , YOSHIFUJI Hideaki / =?utf-8?B?5ZCJ6Jek6Iux5piO?= , netdev@vger.kernel.org To: Brian Haley Return-path: Received: from mx1.redhat.com ([209.132.183.28]:52425 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753837Ab0EaMuT (ORCPT ); Mon, 31 May 2010 08:50:19 -0400 Content-Disposition: inline In-Reply-To: <20100531084620.GB1929@jolsa.lab.eng.brq.redhat.com> Sender: netdev-owner@vger.kernel.org List-ID: On Mon, May 31, 2010 at 10:46:20AM +0200, Jiri Olsa wrote: > On Fri, May 28, 2010 at 02:17:43PM -0400, Brian Haley wrote: > > Commit f4f914b5 (net: ipv6 bind to device issue) caused > > a regression with Mobile IPv6 when it changed the meaning > > of fl->oif to become a strict requirement of the route > > lookup. Instead, only force strict mode when > > sk->sk_bound_dev_if is set on the calling socket, getting > > the intended behavior and fixing the regression. > > > > Tested-by: Arnaud Ebalard > > Signed-off-by: Brian Haley > > > > diff --git a/net/ipv6/route.c b/net/ipv6/route.c > > index 294cbe8..252d761 100644 > > --- a/net/ipv6/route.c > > +++ b/net/ipv6/route.c > > @@ -814,7 +814,7 @@ struct dst_entry * ip6_route_output(struct net *net, struct sock *sk, > > { > > int flags = 0; > > > > - if (fl->oif || rt6_need_strict(&fl->fl6_dst)) > > + if ((sk && sk->sk_bound_dev_if) || rt6_need_strict(&fl->fl6_dst)) > > flags |= RT6_LOOKUP_F_IFACE; > > > > if (!ipv6_addr_any(&fl->fl6_src)) > hi, > > sorry for the late reply, I was out last week.. > > the change looks ok, I'll verify it with the reproducer > I used for the last fix > > thanks, > jirka it passed the test for me, so it looks fine jirka