Re: [PATCH nf-next 3/7] netfilter: flowtable: rename tun.l3_proto to tun.inner_proto

> This field refers to the inner protocol that is encapsulated by the
> tunnel header, just a comestic change. No functional changes are
> expected.
> 
> Signed-off-by: Pablo Neira Ayuso <[email protected]>

Acked-by: Lorenzo Bianconi <[email protected]>

> ---
>  include/linux/netdevice.h             | 2 +-
>  include/net/netfilter/nf_flow_table.h | 2 +-
>  net/ipv4/ipip.c                       | 2 +-
>  net/ipv6/ip6_tunnel.c                 | 2 +-
>  net/netfilter/nf_flow_table_ip.c      | 6 +++---
>  net/netfilter/nf_flow_table_path.c    | 4 ++--
>  6 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index d9962c50bd60..68ccb5868070 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -902,7 +902,7 @@ struct net_device_path {
>  				struct in6_addr	dst_v6;
>  			};
>  
> -			u8	l3_proto;
> +			u8	inner_proto;
>  		} tun;
>  		struct {
>  			enum {
> diff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h
> index a090ec3ffef2..f2e2771f188f 100644
> --- a/include/net/netfilter/nf_flow_table.h
> +++ b/include/net/netfilter/nf_flow_table.h
> @@ -117,7 +117,7 @@ struct flow_offload_tunnel {
>  		struct in6_addr	dst_v6;
>  	};
>  
> -	u8	l3_proto;
> +	u8	inner_proto;
>  };
>  
>  struct flow_offload_tuple {
> diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
> index 62a374079bfc..1630325c77d3 100644
> --- a/net/ipv4/ipip.c
> +++ b/net/ipv4/ipip.c
> @@ -378,7 +378,7 @@ static int ipip_fill_forward_path(struct net_device_path_ctx *ctx,
>  	path->type = DEV_PATH_TUN;
>  	path->tun.src_v4.s_addr = tiph->saddr;
>  	path->tun.dst_v4.s_addr = tiph->daddr;
> -	path->tun.l3_proto = IPPROTO_IPIP;
> +	path->tun.inner_proto = IPPROTO_IPIP;
>  	path->tun.dst = &rt->dst;
>  	path->dev = ctx->dev;
>  
> diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
> index 3bfaa98e7f33..7b54919232ba 100644
> --- a/net/ipv6/ip6_tunnel.c
> +++ b/net/ipv6/ip6_tunnel.c
> @@ -1872,7 +1872,7 @@ static int ip6_tnl_fill_forward_path(struct net_device_path_ctx *ctx,
>  		path->type = DEV_PATH_TUN;
>  		path->tun.src_v6 = fl6.saddr;
>  		path->tun.dst_v6 = fl6.daddr;
> -		path->tun.l3_proto = IPPROTO_IPV6;
> +		path->tun.inner_proto = IPPROTO_IPV6;
>  		path->tun.dst = dst;
>  		path->dev = ctx->dev;
>  		ctx->dev = dst->dev;
> diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c
> index 0b314b10e705..e1aa01763f33 100644
> --- a/net/netfilter/nf_flow_table_ip.c
> +++ b/net/netfilter/nf_flow_table_ip.c
> @@ -197,7 +197,7 @@ static void nf_flow_tuple_encap(struct nf_flowtable_ctx *ctx,
>  		if (ctx->tun.proto == IPPROTO_IPIP) {
>  			tuple->tun.dst_v4.s_addr = iph->daddr;
>  			tuple->tun.src_v4.s_addr = iph->saddr;
> -			tuple->tun.l3_proto = IPPROTO_IPIP;
> +			tuple->tun.inner_proto = IPPROTO_IPIP;
>  		}
>  		break;
>  	case htons(ETH_P_IPV6):
> @@ -205,7 +205,7 @@ static void nf_flow_tuple_encap(struct nf_flowtable_ctx *ctx,
>  		if (ctx->tun.proto == IPPROTO_IPV6) {
>  			tuple->tun.dst_v6 = ip6h->daddr;
>  			tuple->tun.src_v6 = ip6h->saddr;
> -			tuple->tun.l3_proto = IPPROTO_IPV6;
> +			tuple->tun.inner_proto = IPPROTO_IPV6;
>  		}
>  		break;
>  	default:
> @@ -611,7 +611,7 @@ static int nf_flow_tunnel_ipip_push(struct net *net, struct sk_buff *skb,
>  	iph->version	= 4;
>  	iph->ihl	= sizeof(*iph) >> 2;
>  	iph->frag_off	= ip_mtu_locked(&rt->dst) ? 0 : frag_off;
> -	iph->protocol	= tuple->tun.l3_proto;
> +	iph->protocol	= tuple->tun.inner_proto;
>  	iph->tos	= tos;
>  	iph->daddr	= tuple->tun.src_v4.s_addr;
>  	iph->saddr	= tuple->tun.dst_v4.s_addr;
> diff --git a/net/netfilter/nf_flow_table_path.c b/net/netfilter/nf_flow_table_path.c
> index 5f166da3b09b..1e55644f2edb 100644
> --- a/net/netfilter/nf_flow_table_path.c
> +++ b/net/netfilter/nf_flow_table_path.c
> @@ -133,7 +133,7 @@ static int nft_dev_path_info(struct net_device_path_stack *stack,
>  
>  				info->tun.src_v6 = path->tun.src_v6;
>  				info->tun.dst_v6 = path->tun.dst_v6;
> -				info->tun.l3_proto = path->tun.l3_proto;
> +				info->tun.inner_proto = path->tun.inner_proto;
>  				info->tun_dst = path->tun.dst;
>  				info->num_tuns++;
>  			} else {
> @@ -245,7 +245,7 @@ static int nft_dev_forward_path(const struct nft_pktinfo *pkt,
>  	if (info.num_tuns) {
>  		route->tuple[!dir].in.tun.src_v6 = info.tun.dst_v6;
>  		route->tuple[!dir].in.tun.dst_v6 = info.tun.src_v6;
> -		route->tuple[!dir].in.tun.l3_proto = info.tun.l3_proto;
> +		route->tuple[!dir].in.tun.inner_proto = info.tun.inner_proto;
>  		route->tuple[!dir].in.num_tuns = info.num_tuns;
>  		dst_release(route->tuple[dir].dst);
>  		route->tuple[dir].dst = info.tun_dst;
> -- 
> 2.47.3
>

-----BEGIN PGP SIGNATURE-----

iHUEABYKAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCanWfBAAKCRA6cBh0uS2t
rN7EAP9KqWeLvjSB54yOHtoLixkXxKaLrFfbNeHFGVLdvvRYiQEAkuqk7cKL+8rR
x2v5XRFsNKDdU9UEyyAEk7qjNQ/s1gA=
=PT6T
-----END PGP SIGNATURE-----