[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:
parent
e3ac529815
commit
f9d8928f83
|
@ -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,
|
||||
|
|
|
@ -272,7 +272,7 @@ nlmsg_failure:
|
|||
|
||||
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;
|
||||
|
|
|
@ -269,7 +269,7 @@ nlmsg_failure:
|
|||
|
||||
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;
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -534,7 +534,7 @@ nla_put_failure:
|
|||
|
||||
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;
|
||||
|
|
Loading…
Reference in New Issue