From: Harald Welte <laforge@netfilter.org>
Date: Thu, 11 Aug 2005 22:31:15 +0000 (-0700)
Subject: [NETFILTER]: Fix NF_QUEUE_NR() macro
X-Git-Tag: v2.6.14-rc1~1035^2~110
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5917ed961def82a4dba9198d11a75f79d115a8cb;p=linux-2.6-omap-h63xx.git

[NETFILTER]: Fix NF_QUEUE_NR() macro

I obviously wanted to use bitwise-or, not logical or.

Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index ac3c61411d4..189ba67ba60 100644
--- a/include/linux/netfilter.h
+++ b/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__