Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a2e86f6 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_nat: remove unused ct arg from lookup functions 



Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent c1c7e44b

include/net/netfilter/nf_nat_l3proto.h

+8 −16
Original line number Diff line number Diff line
@@ -48,30 +48,26 @@ unsigned int nf_nat_ipv4_in(void *priv, struct sk_buff *skb, 
			    const struct nf_hook_state *state,

			    unsigned int (*do_chain)(void *priv,

						     struct sk_buff *skb,

						     const struct nf_hook_state *state,

						     struct nf_conn *ct));

						     const struct nf_hook_state *state));



unsigned int nf_nat_ipv4_out(void *priv, struct sk_buff *skb,

			     const struct nf_hook_state *state,

			     unsigned int (*do_chain)(void *priv,

						      struct sk_buff *skb,

						      const struct nf_hook_state *state,

						      struct nf_conn *ct));

						      const struct nf_hook_state *state));



unsigned int nf_nat_ipv4_local_fn(void *priv,

				  struct sk_buff *skb,

				  const struct nf_hook_state *state,

				  unsigned int (*do_chain)(void *priv,

							   struct sk_buff *skb,

							   const struct nf_hook_state *state,

							   struct nf_conn *ct));

							   const struct nf_hook_state *state));



unsigned int nf_nat_ipv4_fn(void *priv, struct sk_buff *skb,

			    const struct nf_hook_state *state,

			    unsigned int (*do_chain)(void *priv,

						     struct sk_buff *skb,

						     const struct nf_hook_state *state,

						     struct nf_conn *ct));

						     const struct nf_hook_state *state));



int nf_nat_icmpv6_reply_translation(struct sk_buff *skb, struct nf_conn *ct,

				    enum ip_conntrack_info ctinfo,
@@ -81,29 +77,25 @@ unsigned int nf_nat_ipv6_in(void *priv, struct sk_buff *skb, 
			    const struct nf_hook_state *state,

			    unsigned int (*do_chain)(void *priv,

						     struct sk_buff *skb,

						     const struct nf_hook_state *state,

						     struct nf_conn *ct));

						     const struct nf_hook_state *state));



unsigned int nf_nat_ipv6_out(void *priv, struct sk_buff *skb,

			     const struct nf_hook_state *state,

			     unsigned int (*do_chain)(void *priv,

						      struct sk_buff *skb,

						      const struct nf_hook_state *state,

						      struct nf_conn *ct));

						      const struct nf_hook_state *state));



unsigned int nf_nat_ipv6_local_fn(void *priv,

				  struct sk_buff *skb,

				  const struct nf_hook_state *state,

				  unsigned int (*do_chain)(void *priv,

							   struct sk_buff *skb,

							   const struct nf_hook_state *state,

							   struct nf_conn *ct));

							   const struct nf_hook_state *state));



unsigned int nf_nat_ipv6_fn(void *priv, struct sk_buff *skb,

			    const struct nf_hook_state *state,

			    unsigned int (*do_chain)(void *priv,

						     struct sk_buff *skb,

						     const struct nf_hook_state *state,

						     struct nf_conn *ct));

						     const struct nf_hook_state *state));



#endif /* _NF_NAT_L3PROTO_H */

net/ipv4/netfilter/iptable_nat.c

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ static const struct xt_table nf_nat_ipv4_table = { 


static unsigned int iptable_nat_do_chain(void *priv,

					 struct sk_buff *skb,

					 const struct nf_hook_state *state,

					 struct nf_conn *ct)

					 const struct nf_hook_state *state)

{

	return ipt_do_table(skb, state, state->net->ipv4.nat_table);

}

net/ipv4/netfilter/nf_nat_l3proto_ipv4.c

+5 −9
Original line number Diff line number Diff line
@@ -246,8 +246,7 @@ nf_nat_ipv4_fn(void *priv, struct sk_buff *skb, 
	       const struct nf_hook_state *state,

	       unsigned int (*do_chain)(void *priv,

					struct sk_buff *skb,

					const struct nf_hook_state *state,

					struct nf_conn *ct))

					const struct nf_hook_state *state))

{

	struct nf_conn *ct;

	enum ip_conntrack_info ctinfo;
@@ -285,7 +284,7 @@ nf_nat_ipv4_fn(void *priv, struct sk_buff *skb, 
		if (!nf_nat_initialized(ct, maniptype)) {

			unsigned int ret;



			ret = do_chain(priv, skb, state, ct);

			ret = do_chain(priv, skb, state);

			if (ret != NF_ACCEPT)

				return ret;
@@ -326,8 +325,7 @@ nf_nat_ipv4_in(void *priv, struct sk_buff *skb, 
	       const struct nf_hook_state *state,

	       unsigned int (*do_chain)(void *priv,

					 struct sk_buff *skb,

					 const struct nf_hook_state *state,

					 struct nf_conn *ct))

					 const struct nf_hook_state *state))

{

	unsigned int ret;

	__be32 daddr = ip_hdr(skb)->daddr;
@@ -346,8 +344,7 @@ nf_nat_ipv4_out(void *priv, struct sk_buff *skb, 
		const struct nf_hook_state *state,

		unsigned int (*do_chain)(void *priv,

					  struct sk_buff *skb,

					  const struct nf_hook_state *state,

					  struct nf_conn *ct))

					  const struct nf_hook_state *state))

{

#ifdef CONFIG_XFRM

	const struct nf_conn *ct;
@@ -383,8 +380,7 @@ nf_nat_ipv4_local_fn(void *priv, struct sk_buff *skb, 
		     const struct nf_hook_state *state,

		     unsigned int (*do_chain)(void *priv,

					       struct sk_buff *skb,

					       const struct nf_hook_state *state,

					       struct nf_conn *ct))

					       const struct nf_hook_state *state))

{

	const struct nf_conn *ct;

	enum ip_conntrack_info ctinfo;

net/ipv4/netfilter/nft_chain_nat_ipv4.c

+1 −2
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ 


static unsigned int nft_nat_do_chain(void *priv,

				      struct sk_buff *skb,

				      const struct nf_hook_state *state,

				      struct nf_conn *ct)

				      const struct nf_hook_state *state)

{

	struct nft_pktinfo pkt;

net/ipv6/netfilter/ip6table_nat.c

+1 −2
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ static const struct xt_table nf_nat_ipv6_table = { 


static unsigned int ip6table_nat_do_chain(void *priv,

					  struct sk_buff *skb,

					  const struct nf_hook_state *state,

					  struct nf_conn *ct)

					  const struct nf_hook_state *state)

{

	return ip6t_do_table(skb, state, state->net->ipv6.ip6table_nat);

}