Re: [PATCH] net/ipv6: remove redundant err variable

[David Ahern]

On 1/12/22 1:26 AM, cgel.zte@xxxxxxxxx wrote:
> diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
> index fe786df4f849..897194eb3b89 100644
> --- a/net/ipv6/ip6_tunnel.c
> +++ b/net/ipv6/ip6_tunnel.c
> @@ -698,13 +698,12 @@ mplsip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
>  	    u8 type, u8 code, int offset, __be32 info)
>  {
>  	__u32 rel_info = ntohl(info);
> -	int err, rel_msg = 0;
> +	int rel_msg = 0;

this line needs to be moved down to maintain reverse xmas tree ordering.

You need to make the subject
'[PATCH net-next] net/ipv6: remove redundant err variable'

and since net-next is closed you will need to resubmit when it is open.

>  	u8 rel_type = type;
>  	u8 rel_code = code;
>  
> -	err = ip6_tnl_err(skb, IPPROTO_MPLS, opt, &rel_type, &rel_code,
> +	return ip6_tnl_err(skb, IPPROTO_MPLS, opt, &rel_type, &rel_code,
>  			  &rel_msg, &rel_info, offset);
> -	return err;
>  }
>  
>  static int ip4ip6_dscp_ecn_decapsulate(const struct ip6_tnl *t,