linux-kernel - Re: linux-next: manual merge of the net-next tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Tue, 5 Feb 2013 10:21:22 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Pirko <jiri@...nulli.us>
Cc:	David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Marcelo Ricardo Leitner <mleitner@...hat.com>,
	"YOSHIFUJI Hideaki / 吉藤英明" <yoshfuji@...ux-ipv6.org>
Subject: Re: linux-next: manual merge of the net-next tree with the net tree

Hi Jiri,

On Sat, 2 Feb 2013 11:05:06 +0100 Jiri Pirko <jiri@...nulli.us> 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@...b.auug.org.au

Content of type "application/pgp-signature" skipped