commit 5917ed961def82a4dba9198d11a75f79d115a8cb
author Harald Welte <laforge@netfilter.org> Thu Aug 11 15:31:15 2005 -0700
committer David S. Miller <davem@sunset.davemloft.net> Mon Aug 29 15:57:03 2005 -0700
tree 4e7ba1b827e70d60cb6fd42ea18bd618757a8908
parent 622439270c74f3ad4f69d1417aca4bb3b79514f4

[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>

include/linux/netfilter.h

diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index ac3c614..189ba67 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__