From 9dfd0a331bfb6d8331ba2fb6d6591f2f884c322d Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 5 Dec 2007 01:24:30 -0800
Subject: [PATCH] --- yaml --- r: 78305 b: refs/heads/master c:
 f9d8928f8340ab8e76f1da4799cb19a6ff58b83d h: refs/heads/master i:   78303:
 2cf6fc5bb9d973469646958910db8feba0454ed8 v: v3

---
 [refs]                                | 2 +-
 trunk/include/linux/netfilter.h       | 3 +--
 trunk/net/ipv4/netfilter/ip_queue.c   | 2 +-
 trunk/net/ipv6/netfilter/ip6_queue.c  | 2 +-
 trunk/net/netfilter/nf_queue.c        | 2 +-
 trunk/net/netfilter/nfnetlink_queue.c | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 056b7f68b195..bf39d58f410f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3ac5298159c5286cef86f0865d4fa6a606bd391
+refs/heads/master: f9d8928f8340ab8e76f1da4799cb19a6ff58b83d
diff --git a/trunk/include/linux/netfilter.h b/trunk/include/linux/netfilter.h
index c2c3fafa5fd0..1ba60112ab83 100644
--- a/trunk/include/linux/netfilter.h
+++ b/trunk/include/linux/netfilter.h
@@ -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,
diff --git a/trunk/net/ipv4/netfilter/ip_queue.c b/trunk/net/ipv4/netfilter/ip_queue.c
index 062ff196f2c5..08e7f8b4e951 100644
--- a/trunk/net/ipv4/netfilter/ip_queue.c
+++ b/trunk/net/ipv4/netfilter/ip_queue.c
@@ -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;
diff --git a/trunk/net/ipv6/netfilter/ip6_queue.c b/trunk/net/ipv6/netfilter/ip6_queue.c
index d6e971bd9fe1..5a9ca0d4fb2f 100644
--- a/trunk/net/ipv6/netfilter/ip6_queue.c
+++ b/trunk/net/ipv6/netfilter/ip6_queue.c
@@ -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;
diff --git a/trunk/net/netfilter/nf_queue.c b/trunk/net/netfilter/nf_queue.c
index dd18126a1a6d..c098ccbbbcee 100644
--- a/trunk/net/netfilter/nf_queue.c
+++ b/trunk/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/trunk/net/netfilter/nfnetlink_queue.c b/trunk/net/netfilter/nfnetlink_queue.c
index b75091c8ae5e..94ec1c263d03 100644
--- a/trunk/net/netfilter/nfnetlink_queue.c
+++ b/trunk/net/netfilter/nfnetlink_queue.c
@@ -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;