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

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

netfilter: conntrack: remove pf argument from l4 packet functions 



not needed/used anymore.

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

include/net/netfilter/nf_conntrack_l4proto.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ struct nf_conntrack_l4proto { 
		      const struct sk_buff *skb,

		      unsigned int dataoff,

		      enum ip_conntrack_info ctinfo,

		      u_int8_t pf,

		      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
@@ -81,7 +81,6 @@ static int icmp_packet(struct nf_conn *ct, 
		       const struct sk_buff *skb,

		       unsigned int dataoff,

		       enum ip_conntrack_info ctinfo,

		       u_int8_t pf,

		       unsigned int *timeout)

{

	/* Do not immediately delete the connection after the first

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ static int icmpv6_packet(struct nf_conn *ct, 
		       const struct sk_buff *skb,

		       unsigned int dataoff,

		       enum ip_conntrack_info ctinfo,

		       u_int8_t pf,

		       unsigned int *timeout)

{

	/* Do not immediately delete the connection after the first

net/netfilter/nf_conntrack_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1419,7 +1419,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, timeouts);

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

	if (ret <= 0) {

		/* Invalid: inverse of the return code tells

		 * the netfilter core what to do */

net/netfilter/nf_conntrack_proto_dccp.c

+0 −1
Original line number Diff line number Diff line
@@ -467,7 +467,6 @@ 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 *timeouts)

{

	enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);