Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

include/linux/netfilter.h

+1 −2
Original line number Diff line number Diff line
@@ -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,

net/ipv4/netfilter/ip_queue.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/ipv6/netfilter/ip6_queue.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/netfilter/nf_queue.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

net/netfilter/nfnetlink_queue.c

+1 −1
Original line number Diff line number Diff line
@@ -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;