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

Commit 433029ec authored by Taehee Yoo's avatar Taehee Yoo Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_conntrack_broadcast: remove useless parameter 



parameter protoff in nf_conntrack_broadcast_help is not used anywhere.

Signed-off-by: default avatarTaehee Yoo <ap420073@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 580c7d9e

include/net/netfilter/nf_conntrack_helper.h

+1 −2
Original line number Diff line number Diff line
@@ -132,8 +132,7 @@ void nf_conntrack_helper_pernet_fini(struct net *net); 
int nf_conntrack_helper_init(void);

void nf_conntrack_helper_fini(void);



int nf_conntrack_broadcast_help(struct sk_buff *skb, unsigned int protoff,

				struct nf_conn *ct,

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

				enum ip_conntrack_info ctinfo,

				unsigned int timeout);

net/netfilter/nf_conntrack_broadcast.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <net/netfilter/nf_conntrack_expect.h>



int nf_conntrack_broadcast_help(struct sk_buff *skb,

				unsigned int protoff,

				struct nf_conn *ct,

				enum ip_conntrack_info ctinfo,

				unsigned int timeout)

net/netfilter/nf_conntrack_netbios_ns.c

+3 −2
Original line number Diff line number Diff line
@@ -41,9 +41,10 @@ static struct nf_conntrack_expect_policy exp_policy = { 
};



static int netbios_ns_help(struct sk_buff *skb, unsigned int protoff,

		   struct nf_conn *ct, enum ip_conntrack_info ctinfo)

			   struct nf_conn *ct,

			   enum ip_conntrack_info ctinfo)

{

	return nf_conntrack_broadcast_help(skb, protoff, ct, ctinfo, timeout);

	return nf_conntrack_broadcast_help(skb, ct, ctinfo, timeout);

}



static struct nf_conntrack_helper helper __read_mostly = {

net/netfilter/nf_conntrack_snmp.c

+3 −2
Original line number Diff line number Diff line
@@ -36,11 +36,12 @@ int (*nf_nat_snmp_hook)(struct sk_buff *skb, 
EXPORT_SYMBOL_GPL(nf_nat_snmp_hook);



static int snmp_conntrack_help(struct sk_buff *skb, unsigned int protoff,

		struct nf_conn *ct, enum ip_conntrack_info ctinfo)

			       struct nf_conn *ct,

			       enum ip_conntrack_info ctinfo)

{

	typeof(nf_nat_snmp_hook) nf_nat_snmp;



	nf_conntrack_broadcast_help(skb, protoff, ct, ctinfo, timeout);

	nf_conntrack_broadcast_help(skb, ct, ctinfo, timeout);



	nf_nat_snmp = rcu_dereference(nf_nat_snmp_hook);

	if (nf_nat_snmp && ct->status & IPS_NAT_MASK)