From 2cf6fc5bb9d973469646958910db8feba0454ed8 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 5 Dec 2007 01:23:41 -0800
Subject: [PATCH] --- yaml --- r: 78303 b: refs/heads/master c:
 fb46990dba94866462e90623e183d02ec591cf8f h: refs/heads/master i:   78301:
 2e24665e38acc7d8927a13c9fb1de990a141264a   78299:
 4216033184da89e738cb0907899df02e20b606e5   78295:
 4f5e6cfb65d0f803e5a9ad27265505f1981e9017   78287:
 6151adb9d89f8e4231c80abc478e88416903bc0c   78271:
 eed44cd4faaefe1f359eb03dda008a7e520b6a32 v: v3

---
 [refs]                         |  2 +-
 trunk/net/netfilter/core.c     |  5 -----
 trunk/net/netfilter/nf_queue.c | 13 -------------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 37937b81ef0e..2c784b262e42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b1cf0db2aced837fcd50072e81e32c5836a1ee1
+refs/heads/master: fb46990dba94866462e90623e183d02ec591cf8f
diff --git a/trunk/net/netfilter/core.c b/trunk/net/netfilter/core.c
index e6d3a69b9e9b..6819a4113e1e 100644
--- a/trunk/net/netfilter/core.c
+++ b/trunk/net/netfilter/core.c
@@ -51,11 +51,6 @@ void nf_unregister_afinfo(struct nf_afinfo *afinfo)
 }
 EXPORT_SYMBOL_GPL(nf_unregister_afinfo);
 
-/* In this code, we can be waiting indefinitely for userspace to
- * service a packet if a hook returns NF_QUEUE.  We could keep a count
- * of skbuffs queued for userspace, and not deregister a hook unless
- * this is zero, but that sucks.  Now, we simply check when the
- * packets come back: if the hook is gone, the packet is discarded. */
 struct list_head nf_hooks[NPROTO][NF_MAX_HOOKS] __read_mostly;
 EXPORT_SYMBOL(nf_hooks);
 static DEFINE_MUTEX(nf_hook_mutex);
diff --git a/trunk/net/netfilter/nf_queue.c b/trunk/net/netfilter/nf_queue.c
index 81d010a05b98..0bea88c30e51 100644
--- a/trunk/net/netfilter/nf_queue.c
+++ b/trunk/net/netfilter/nf_queue.c
@@ -223,7 +223,6 @@ void nf_reinject(struct sk_buff *skb, struct nf_info *info,
 		 unsigned int verdict)
 {
 	struct list_head *elem = &info->elem->list;
-	struct list_head *i;
 	struct nf_afinfo *afinfo;
 
 	rcu_read_lock();
@@ -245,18 +244,6 @@ void nf_reinject(struct sk_buff *skb, struct nf_info *info,
 	/* Drop reference to owner of hook which queued us. */
 	module_put(info->elem->owner);
 
-	list_for_each_rcu(i, &nf_hooks[info->pf][info->hook]) {
-		if (i == elem)
-			break;
-	}
-
-	if (i == &nf_hooks[info->pf][info->hook]) {
-		/* The module which sent it to userspace is gone. */
-		NFDEBUG("%s: module disappeared, dropping packet.\n",
-			__FUNCTION__);
-		verdict = NF_DROP;
-	}
-
 	/* Continue traversal iff userspace said ok... */
 	if (verdict == NF_REPEAT) {
 		elem = elem->prev;