openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[NETFILTER]: nf_queue: remove unused data pointer 

Remove the data pointer from struct nf_queue_handler. It has never been used
and is useless for the only handler that really matters, nfnetlink_queue,
since the handler is shared between all instances.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2007-12-05 01:24:30 -08:00 committed by David S. Miller
parent e3ac529815
commit f9d8928f83
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/netfilter.h
View File

@ -277,8 +277,7 @@ int compat_nf_getsockopt(struct sock *sk, int pf, int optval,
/* Packet queuing */
struct nf_queue_handler {
int (*outfn)(struct sk_buff *skb, struct nf_info *info,
unsigned int queuenum, void *data);
void *data;
unsigned int queuenum);
char *name;
};
extern int nf_register_queue_handler(int pf,

2
net/ipv4/netfilter/ip_queue.c
View File

@ -272,7 +272,7 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp)
static int
ipq_enqueue_packet(struct sk_buff *skb, struct nf_info *info,
unsigned int queuenum, void *data)
unsigned int queuenum)
{
int status = -EINVAL;
struct sk_buff *nskb;

2
net/ipv6/netfilter/ip6_queue.c
View File

@ -269,7 +269,7 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp)
static int
ipq_enqueue_packet(struct sk_buff *skb, struct nf_info *info,
unsigned int queuenum, void *data)
unsigned int queuenum)
{
int status = -EINVAL;
struct sk_buff *nskb;

2
net/netfilter/nf_queue.c
View File

@ -153,7 +153,7 @@ static int __nf_queue(struct sk_buff *skb,
}
#endif
afinfo->saveroute(skb, info);
status = qh->outfn(skb, info, queuenum, qh->data);
status = qh->outfn(skb, info, queuenum);
rcu_read_unlock();

2
net/netfilter/nfnetlink_queue.c
View File

@ -534,7 +534,7 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
static int
nfqnl_enqueue_packet(struct sk_buff *skb, struct nf_info *info,
unsigned int queuenum, void *data)
unsigned int queuenum)
{
int status = -EINVAL;
struct sk_buff *nskb;