tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Taehee Yoo
and committed by
Pablo Neira Ayuso
433029ec
580c7d9e
+7
-7
+1
-2
include/net/netfilter/nf_conntrack_helper.h
+1
-2
include/net/netfilter/nf_conntrack_helper.h
···
132
132
int nf_conntrack_helper_init(void);
133
133
void nf_conntrack_helper_fini(void);
134
134
135
-
int nf_conntrack_broadcast_help(struct sk_buff *skb, unsigned int protoff,
136
-
struct nf_conn *ct,
135
+
int nf_conntrack_broadcast_help(struct sk_buff *skb, struct nf_conn *ct,
137
136
enum ip_conntrack_info ctinfo,
138
137
unsigned int timeout);
139
138
-1
net/netfilter/nf_conntrack_broadcast.c
-1
net/netfilter/nf_conntrack_broadcast.c
+3
-2
net/netfilter/nf_conntrack_netbios_ns.c
+3
-2
net/netfilter/nf_conntrack_netbios_ns.c
···
41
41
};
42
42
43
43
static int netbios_ns_help(struct sk_buff *skb, unsigned int protoff,
44
-
struct nf_conn *ct, enum ip_conntrack_info ctinfo)
44
+
struct nf_conn *ct,
45
+
enum ip_conntrack_info ctinfo)
45
46
{
46
-
return nf_conntrack_broadcast_help(skb, protoff, ct, ctinfo, timeout);
47
+
return nf_conntrack_broadcast_help(skb, ct, ctinfo, timeout);
47
48
}
48
49
49
50
static struct nf_conntrack_helper helper __read_mostly = {
+3
-2
net/netfilter/nf_conntrack_snmp.c
+3
-2
net/netfilter/nf_conntrack_snmp.c
···
36
36
EXPORT_SYMBOL_GPL(nf_nat_snmp_hook);
37
37
38
38
static int snmp_conntrack_help(struct sk_buff *skb, unsigned int protoff,
39
-
struct nf_conn *ct, enum ip_conntrack_info ctinfo)
39
+
struct nf_conn *ct,
40
+
enum ip_conntrack_info ctinfo)
40
41
{
41
42
typeof(nf_nat_snmp_hook) nf_nat_snmp;
42
43
43
-
nf_conntrack_broadcast_help(skb, protoff, ct, ctinfo, timeout);
44
+
nf_conntrack_broadcast_help(skb, ct, ctinfo, timeout);
44
45
45
46
nf_nat_snmp = rcu_dereference(nf_nat_snmp_hook);
46
47
if (nf_nat_snmp && ct->status & IPS_NAT_MASK)