diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-12-05 01:24:30 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:56:10 -0800 |
| commit | f9d8928f8340ab8e76f1da4799cb19a6ff58b83d (patch) | |
| tree | e2c763679016394bebee40a56dafe708ffb9d0de /net | |
| parent | e3ac5298159c5286cef86f0865d4fa6a606bd391 (diff) | |
[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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/ip_queue.c | 2 | ||||
| -rw-r--r-- | net/ipv6/netfilter/ip6_queue.c | 2 | ||||
| -rw-r--r-- | net/netfilter/nf_queue.c | 2 | ||||
| -rw-r--r-- | net/netfilter/nfnetlink_queue.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c index 062ff196f2c..08e7f8b4e95 100644 --- a/net/ipv4/netfilter/ip_queue.c +++ b/net/ipv4/netfilter/ip_queue.c @@ -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; diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c index d6e971bd9fe..5a9ca0d4fb2 100644 --- a/net/ipv6/netfilter/ip6_queue.c +++ b/net/ipv6/netfilter/ip6_queue.c @@ -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; diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c index dd18126a1a6..c098ccbbbce 100644 --- a/net/netfilter/nf_queue.c +++ b/net/netfilter/nf_queue.c @@ -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(); diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index b75091c8ae5..94ec1c263d0 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -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; |