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

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

netfilter: remove unused hooknum arg from packet functions 



tested with allmodconfig build.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent a6912055

include/net/netfilter/nf_conntrack_l4proto.h

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ struct nf_conntrack_l4proto { 
		      unsigned int dataoff,

		      enum ip_conntrack_info ctinfo,

		      u_int8_t pf,

		      unsigned int hooknum,

		      unsigned int *timeouts);



	/* Called when a new connection for this protocol found;

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ static int icmp_packet(struct nf_conn *ct, 
		       unsigned int dataoff,

		       enum ip_conntrack_info ctinfo,

		       u_int8_t pf,

		       unsigned int hooknum,

		       unsigned int *timeout)

{

	/* Do not immediately delete the connection after the first

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+2 −4
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ static int icmpv6_packet(struct nf_conn *ct, 
		       unsigned int dataoff,

		       enum ip_conntrack_info ctinfo,

		       u_int8_t pf,

		       unsigned int hooknum,

		       unsigned int *timeout)

{

	/* Do not immediately delete the connection after the first
@@ -129,8 +128,7 @@ static bool icmpv6_new(struct nf_conn *ct, const struct sk_buff *skb, 
static int

icmpv6_error_message(struct net *net, struct nf_conn *tmpl,

		     struct sk_buff *skb,

		     unsigned int icmp6off,

		     unsigned int hooknum)

		     unsigned int icmp6off)

{

	struct nf_conntrack_tuple intuple, origtuple;

	const struct nf_conntrack_tuple_hash *h;
@@ -214,7 +212,7 @@ icmpv6_error(struct net *net, struct nf_conn *tmpl, 
	if (icmp6h->icmp6_type >= 128)

		return NF_ACCEPT;



	return icmpv6_error_message(net, tmpl, skb, dataoff, hooknum);

	return icmpv6_error_message(net, tmpl, skb, dataoff);

}



#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

net/netfilter/nf_conntrack_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1414,7 +1414,7 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum, 
	/* Decide what timeout policy we want to apply to this flow. */

	timeouts = nf_ct_timeout_lookup(net, ct, l4proto);



	ret = l4proto->packet(ct, skb, dataoff, ctinfo, pf, hooknum, timeouts);

	ret = l4proto->packet(ct, skb, dataoff, ctinfo, pf, timeouts);

	if (ret <= 0) {

		/* Invalid: inverse of the return code tells

		 * the netfilter core what to do */

net/netfilter/nf_conntrack_proto_dccp.c

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ static unsigned int *dccp_get_timeouts(struct net *net) 


static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb,

		       unsigned int dataoff, enum ip_conntrack_info ctinfo,

		       u_int8_t pf, unsigned int hooknum,

		       u_int8_t pf,

		       unsigned int *timeouts)

{

	struct net *net = nf_ct_net(ct);