Re: linux-next: build failure after merge of the net-next tree

Ido Schimmel
2017-12-22T07:57:33Z

Hi Stephen,

On Fri, Dec 22, 2017 at 11:45:19AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the net-next tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:

[...]

> I have added the following merge fix patch for today (I am guessing
> a bit here):
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 22 Dec 2017 11:25:13 +1100
> Subject: [PATCH] ipv6: fix up for "ipv6: Move dst->from into struct rt6_info"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> net/ipv6/route.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/net/ipv6/route.c b/net/ipv6/route.c
> index 4efaac956f0c..2490280b3394 100644
> --- a/net/ipv6/route.c
> +++ b/net/ipv6/route.c
> @@ -4321,9 +4321,8 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,
> goto errout;
> }
>
> - if (fibmatch && rt->dst.from) {
> - struct rt6_info *ort = container_of(rt->dst.from,
> - struct rt6_info, dst);
> + if (fibmatch && rt->from) {
> + struct rt6_info *ort = rt->from;

Your merge fix is correct. Thanks!

>
> dst_hold(&ort->dst);
> ip6_rt_put(rt);