Re: [PATCH nf-next 4/7] netfilter: flowtable: rename ctx.tun.proto to ctx.tun.inner_proto

[Lorenzo Bianconi <lorenzo@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 2699 bytes --]

> For consistency with the tun.l3proto rename, use same name field.
> No functional changes are intended.
> 
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>

> ---
>  net/netfilter/nf_flow_table_ip.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c
> index e1aa01763f33..ed90809b206e 100644
> --- a/net/netfilter/nf_flow_table_ip.c
> +++ b/net/netfilter/nf_flow_table_ip.c
> @@ -153,7 +153,7 @@ struct nf_flowtable_ctx {
>  		/* Tunnel IP header size */
>  		u32 hdr_size;
>  		/* IP tunnel protocol */
> -		u8 proto;
> +		u8 inner_proto;
>  	} tun;
>  };
>  
> @@ -194,7 +194,7 @@ static void nf_flow_tuple_encap(struct nf_flowtable_ctx *ctx,
>  	switch (inner_proto) {
>  	case htons(ETH_P_IP):
>  		iph = (struct iphdr *)(skb_network_header(skb) + offset);
> -		if (ctx->tun.proto == IPPROTO_IPIP) {
> +		if (ctx->tun.inner_proto == IPPROTO_IPIP) {
>  			tuple->tun.dst_v4.s_addr = iph->daddr;
>  			tuple->tun.src_v4.s_addr = iph->saddr;
>  			tuple->tun.inner_proto = IPPROTO_IPIP;
> @@ -202,7 +202,7 @@ static void nf_flow_tuple_encap(struct nf_flowtable_ctx *ctx,
>  		break;
>  	case htons(ETH_P_IPV6):
>  		ip6h = (struct ipv6hdr *)(skb_network_header(skb) + offset);
> -		if (ctx->tun.proto == IPPROTO_IPV6) {
> +		if (ctx->tun.inner_proto == IPPROTO_IPV6) {
>  			tuple->tun.dst_v6 = ip6h->daddr;
>  			tuple->tun.src_v6 = ip6h->saddr;
>  			tuple->tun.inner_proto = IPPROTO_IPV6;
> @@ -328,7 +328,7 @@ static bool nf_flow_ip4_tunnel_proto(struct nf_flowtable_ctx *ctx,
>  		return false;
>  
>  	if (iph->protocol == IPPROTO_IPIP) {
> -		ctx->tun.proto = iph->protocol;
> +		ctx->tun.inner_proto = iph->protocol;
>  		ctx->tun.hdr_size = size;
>  		ctx->offset += ctx->tun.hdr_size;
>  	}
> @@ -353,7 +353,7 @@ static bool nf_flow_ip6_tunnel_proto(struct nf_flowtable_ctx *ctx,
>  		return false;
>  
>  	if (ip6h->nexthdr == IPPROTO_IPV6) {
> -		ctx->tun.proto = ip6h->nexthdr;
> +		ctx->tun.inner_proto = ip6h->nexthdr;
>  		ctx->tun.hdr_size = sizeof(*ip6h);
>  		ctx->offset += ctx->tun.hdr_size;
>  	}
> @@ -367,8 +367,8 @@ static bool nf_flow_ip6_tunnel_proto(struct nf_flowtable_ctx *ctx,
>  static void nf_flow_ip_tunnel_pop(struct nf_flowtable_ctx *ctx,
>  				  struct sk_buff *skb)
>  {
> -	if (ctx->tun.proto != IPPROTO_IPIP &&
> -	    ctx->tun.proto != IPPROTO_IPV6)
> +	if (ctx->tun.inner_proto != IPPROTO_IPIP &&
> +	    ctx->tun.inner_proto != IPPROTO_IPV6)
>  		return;
>  
>  	skb_pull(skb, ctx->tun.hdr_size);
> -- 
> 2.47.3
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]