From 0465be8886d7ea9c83c403c4eebe48f046617db9 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@netfilter.org>
Date: Thu, 11 Aug 2005 15:31:15 -0700
Subject: [PATCH] --- yaml --- r: 6335 b: refs/heads/master c:
 5917ed961def82a4dba9198d11a75f79d115a8cb h: refs/heads/master i:   6333:
 84cf2fb79537094f35cc71bbda1f7e5c15077ab3   6331:
 b6a865931a7c70d84a15058ba13de69b517ebfb4   6327:
 a7f9449f7de9ac2e16dc3b94c8be5e15fcd526ce   6319:
 cc5256f775374fd79af7316da44523138cfea39f   6303:
 e7a910558edcb4ac0632e6734f01e83fce7b75fb   6271:
 59542c6726961b8183bb65412d54c2863f5f412e v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netfilter.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2fc5411e7279..0a4c3166a24a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 622439270c74f3ad4f69d1417aca4bb3b79514f4
+refs/heads/master: 5917ed961def82a4dba9198d11a75f79d115a8cb
diff --git a/trunk/include/linux/netfilter.h b/trunk/include/linux/netfilter.h
index ac3c61411d4b..189ba67ba603 100644
--- a/trunk/include/linux/netfilter.h
+++ b/trunk/include/linux/netfilter.h
@@ -29,7 +29,7 @@
 #define NF_VERDICT_QMASK 0xffff0000
 #define NF_VERDICT_QBITS 16
 
-#define NF_QUEUE_NR(x) ((x << NF_VERDICT_QBITS) & NF_VERDICT_QMASK || NF_QUEUE)
+#define NF_QUEUE_NR(x) ((x << NF_VERDICT_QBITS) & NF_VERDICT_QMASK | NF_QUEUE)
 
 /* only for userspace compatibility */
 #ifndef __KERNEL__