netfilter: nf_conntrack_broadcast: remove useless parameter

parameter protoff in nf_conntrack_broadcast_help is not used anywhere.

Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
index fc39bbaf107c791bdf75b28db8aef8179eada1a3..32c2a94a219d603dda33a2247f00a36b56fb786a 100644 (file)
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
@@ -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);
 

diff --git a/net/netfilter/nf_conntrack_broadcast.c b/net/netfilter/nf_conntrack_broadcast.c
index ecc3ab78463392c825ea63a03fefa4134666630c..a1086bdec2429c2d26d4cbb6b2a12bd8927b013d 100644 (file)
--- a/net/netfilter/nf_conntrack_broadcast.c
+++ b/net/netfilter/nf_conntrack_broadcast.c
@@ -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)

diff --git a/net/netfilter/nf_conntrack_netbios_ns.c b/net/netfilter/nf_conntrack_netbios_ns.c
index 496ce173f0c1937c73fb360e402c9c3e3936e1e9..a4a59dc7cf1760aac02857c1aeabed3561c25f2d 100644 (file)
--- a/net/netfilter/nf_conntrack_netbios_ns.c
+++ b/net/netfilter/nf_conntrack_netbios_ns.c
@@ -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 = {

diff --git a/net/netfilter/nf_conntrack_snmp.c b/net/netfilter/nf_conntrack_snmp.c
index 87b95a2c270cd367fd0e910243221f60308c3263..2d0f8e010821ba3b51c2715250294657daad3ea9 100644 (file)
--- a/net/netfilter/nf_conntrack_snmp.c
+++ b/net/netfilter/nf_conntrack_snmp.c
@@ -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)