From: Eli Cooper <elicoo...@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: sta...@vger.kernel.org > Signed-off-by: Eli Cooper <elicoo...@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.