From ad229f77b723929f349c71fea82148a7164edce3 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 5 Dec 2007 01:29:05 -0800
Subject: [PATCH] --- yaml --- r: 78319 b: refs/heads/master c:
 c5de0dfde8b0c5ea3d8b3040db1967f9c1d9748e h: refs/heads/master i:   78317:
 f8bbdc4d13095a43c5e730a14f0913269a0d3e1e   78315:
 552ab9dd154bd7cddf0d6a5ea15b4a58983c76ef   78311:
 07e5201b82748e761d83ce6dd991888c0cd418fa   78303:
 2cf6fc5bb9d973469646958910db8feba0454ed8 v: v3

---
 [refs]                                |  2 +-
 trunk/net/netfilter/nfnetlink_queue.c | 52 +++++++++++----------------
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/[refs] b/[refs]
index a8c2eb0e22cd..f71e66ef7f6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9872bec773c2e8503fec480c1e8a0c732517e257
+refs/heads/master: c5de0dfde8b0c5ea3d8b3040db1967f9c1d9748e
diff --git a/trunk/net/netfilter/nfnetlink_queue.c b/trunk/net/netfilter/nfnetlink_queue.c
index 449b880042a9..37b7655df910 100644
--- a/trunk/net/netfilter/nfnetlink_queue.c
+++ b/trunk/net/netfilter/nfnetlink_queue.c
@@ -176,35 +176,6 @@ __enqueue_entry(struct nfqnl_instance *queue, struct nf_queue_entry *entry)
        queue->queue_total++;
 }
 
-static inline int
-__nfqnl_set_mode(struct nfqnl_instance *queue,
-		 unsigned char mode, unsigned int range)
-{
-	int status = 0;
-
-	switch (mode) {
-	case NFQNL_COPY_NONE:
-	case NFQNL_COPY_META:
-		queue->copy_mode = mode;
-		queue->copy_range = 0;
-		break;
-
-	case NFQNL_COPY_PACKET:
-		queue->copy_mode = mode;
-		/* we're using struct nlattr which has 16bit nla_len */
-		if (range > 0xffff)
-			queue->copy_range = 0xffff;
-		else
-			queue->copy_range = range;
-		break;
-
-	default:
-		status = -EINVAL;
-
-	}
-	return status;
-}
-
 static struct nf_queue_entry *
 find_dequeue_entry(struct nfqnl_instance *queue, unsigned int id)
 {
@@ -540,10 +511,29 @@ static int
 nfqnl_set_mode(struct nfqnl_instance *queue,
 	       unsigned char mode, unsigned int range)
 {
-	int status;
+	int status = 0;
 
 	spin_lock_bh(&queue->lock);
-	status = __nfqnl_set_mode(queue, mode, range);
+	switch (mode) {
+	case NFQNL_COPY_NONE:
+	case NFQNL_COPY_META:
+		queue->copy_mode = mode;
+		queue->copy_range = 0;
+		break;
+
+	case NFQNL_COPY_PACKET:
+		queue->copy_mode = mode;
+		/* we're using struct nlattr which has 16bit nla_len */
+		if (range > 0xffff)
+			queue->copy_range = 0xffff;
+		else
+			queue->copy_range = range;
+		break;
+
+	default:
+		status = -EINVAL;
+
+	}
 	spin_unlock_bh(&queue->lock);
 
 	return status;