Hi Jiri, On Sat, 2 Feb 2013 11:05:06 +0100 Jiri Pirko <jiri@xxxxxxxxxxx> wrote: > > >diff --cc net/ipv6/route.c > >index 363d8b7,f3328bc..0000000 > >--- a/net/ipv6/route.c > >+++ b/net/ipv6/route.c > >@@@ -928,7 -884,7 +884,7 @@@ restart > > dst_hold(&rt->dst); > > read_unlock_bh(&table->tb6_lock); > > > >- if (!rt->n && !(rt->rt6i_flags & (RTF_NONEXTHOP | RTF_LOCAL))) > > - if (!(rt->rt6i_flags & (RTF_NONEXTHOP | RTF_GATEWAY))) > >++ if (!(rt->rt6i_flags & (RTF_NONEXTHOP | RTF_LOCAL | RTF_GATEWAY))) > > I believe that no change here is correct to do. RTF_LOCAL here is needed > only before Yoshifuji's "IPv6 rt->n removal" Thanks for the feedback. I have removed the " | RTF_LOCAL" from the merge resolution. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpOal8UJcqNr.pgp
Description: PGP signature
