Commit f9d8928f authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller

[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: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e3ac5298
...@@ -277,8 +277,7 @@ int compat_nf_getsockopt(struct sock *sk, int pf, int optval, ...@@ -277,8 +277,7 @@ int compat_nf_getsockopt(struct sock *sk, int pf, int optval,
/* Packet queuing */ /* Packet queuing */
struct nf_queue_handler { struct nf_queue_handler {
int (*outfn)(struct sk_buff *skb, struct nf_info *info, int (*outfn)(struct sk_buff *skb, struct nf_info *info,
unsigned int queuenum, void *data); unsigned int queuenum);
void *data;
char *name; char *name;
}; };
extern int nf_register_queue_handler(int pf, extern int nf_register_queue_handler(int pf,
......
...@@ -272,7 +272,7 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp) ...@@ -272,7 +272,7 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp)
static int static int
ipq_enqueue_packet(struct sk_buff *skb, struct nf_info *info, ipq_enqueue_packet(struct sk_buff *skb, struct nf_info *info,
unsigned int queuenum, void *data) unsigned int queuenum)
{ {
int status = -EINVAL; int status = -EINVAL;
struct sk_buff *nskb; struct sk_buff *nskb;
......
...@@ -269,7 +269,7 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp) ...@@ -269,7 +269,7 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp)
static int static int
ipq_enqueue_packet(struct sk_buff *skb, struct nf_info *info, ipq_enqueue_packet(struct sk_buff *skb, struct nf_info *info,
unsigned int queuenum, void *data) unsigned int queuenum)
{ {
int status = -EINVAL; int status = -EINVAL;
struct sk_buff *nskb; struct sk_buff *nskb;
......
...@@ -153,7 +153,7 @@ static int __nf_queue(struct sk_buff *skb, ...@@ -153,7 +153,7 @@ static int __nf_queue(struct sk_buff *skb,
} }
#endif #endif
afinfo->saveroute(skb, info); afinfo->saveroute(skb, info);
status = qh->outfn(skb, info, queuenum, qh->data); status = qh->outfn(skb, info, queuenum);
rcu_read_unlock(); rcu_read_unlock();
......
...@@ -534,7 +534,7 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue, ...@@ -534,7 +534,7 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
static int static int
nfqnl_enqueue_packet(struct sk_buff *skb, struct nf_info *info, nfqnl_enqueue_packet(struct sk_buff *skb, struct nf_info *info,
unsigned int queuenum, void *data) unsigned int queuenum)
{ {
int status = -EINVAL; int status = -EINVAL;
struct sk_buff *nskb; struct sk_buff *nskb;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment