Commit 4f08f173 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: flowtable: move FLOW_OFFLOAD_DIR_MAX away from enumeration 



This allows to remove the default case which should not ever happen and
that was added to avoid gcc warnings on unhandled FLOW_OFFLOAD_DIR_MAX
enumeration case.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 2babb46c

include/net/netfilter/nf_flow_table.h

+1 −1
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ static inline bool nf_flowtable_hw_offload(struct nf_flowtable *flowtable) 
enum flow_offload_tuple_dir {

	FLOW_OFFLOAD_DIR_ORIGINAL = IP_CT_DIR_ORIGINAL,

	FLOW_OFFLOAD_DIR_REPLY = IP_CT_DIR_REPLY,

	FLOW_OFFLOAD_DIR_MAX = IP_CT_DIR_MAX

};

#define FLOW_OFFLOAD_DIR_MAX	IP_CT_DIR_MAX



struct flow_offload_tuple {

	union {

net/netfilter/nf_flow_table_core.c

+0 −4
Original line number Diff line number Diff line
@@ -454,8 +454,6 @@ int nf_flow_snat_port(const struct flow_offload *flow, 
		new_port = flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_port;

		hdr->dest = new_port;

		break;

	default:

		return -1;

	}



	return nf_flow_nat_port(skb, thoff, protocol, port, new_port);
@@ -482,8 +480,6 @@ int nf_flow_dnat_port(const struct flow_offload *flow, 
		new_port = flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.dst_port;

		hdr->source = new_port;

		break;

	default:

		return -1;

	}



	return nf_flow_nat_port(skb, thoff, protocol, port, new_port);

net/netfilter/nf_flow_table_ip.c

+0 −8
Original line number Diff line number Diff line
@@ -96,8 +96,6 @@ static int nf_flow_snat_ip(const struct flow_offload *flow, struct sk_buff *skb, 
		new_addr = flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_v4.s_addr;

		iph->daddr = new_addr;

		break;

	default:

		return -1;

	}

	csum_replace4(&iph->check, addr, new_addr);
@@ -121,8 +119,6 @@ static int nf_flow_dnat_ip(const struct flow_offload *flow, struct sk_buff *skb, 
		new_addr = flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.dst_v4.s_addr;

		iph->saddr = new_addr;

		break;

	default:

		return -1;

	}

	csum_replace4(&iph->check, addr, new_addr);
@@ -371,8 +367,6 @@ static int nf_flow_snat_ipv6(const struct flow_offload *flow, 
		new_addr = flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_v6;

		ip6h->daddr = new_addr;

		break;

	default:

		return -1;

	}



	return nf_flow_nat_ipv6_l4proto(skb, ip6h, thoff, &addr, &new_addr);
@@ -396,8 +390,6 @@ static int nf_flow_dnat_ipv6(const struct flow_offload *flow, 
		new_addr = flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.dst_v6;

		ip6h->saddr = new_addr;

		break;

	default:

		return -1;

	}



	return nf_flow_nat_ipv6_l4proto(skb, ip6h, thoff, &addr, &new_addr);