From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: [PATCH] ip6_tunnel: disable dst caching if tunnel is dual-stack
Date: Tue, 02 Jan 2018 12:33:02 -0500 (EST)
Message-ID: <20180102.123302.2222179447489662456.davem@davemloft.net>
References: <20171225024349.4879-1-elicooper@gmx.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netdev@vger.kernel.org
To: elicooper@gmx.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([184.105.139.130]:50040 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751176AbeABRdE (ORCPT
        <rfc822;netdev@vger.kernel.org>); Tue, 2 Jan 2018 12:33:04 -0500
In-Reply-To: <20171225024349.4879-1-elicooper@gmx.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Eli Cooper <elicooper@gmx.com>
Date: Mon, 25 Dec 2017 10:43:49 +0800

> When an ip6_tunnel is in mode 'any', where the transport layer
> protocol can be either 4 or 41, dst_cache must be disabled.
> 
> This is because xfrm policies might apply to only one of the two
> protocols. Caching dst would cause xfrm policies for one protocol
> incorrectly used for the other.
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Eli Cooper <elicooper@gmx.com>

Please do not CC: stable on networking changes, as per the netdev
FAQ I queue these up by hand.

> -	} else if (!(t->parms.flags &
> +	} else if (t->parms.proto != 0 && !(t->parms.flags &
>  		     (IP6_TNL_F_USE_ORIG_TCLASS | IP6_TNL_F_USE_ORIG_FWMARK))) {

When you adjust the indentation of an inner-expression, you must reindent the
subsequent lines that are also part of that inner-expression.

I've fixed up both of these issues and applied your patch, but please
take care of this yourself next time.

Thanks.