]> err.no Git - linux-2.6/commitdiff
[NETFILTER]: Fix NF_QUEUE_NR() macro
authorHarald Welte <laforge@netfilter.org>
Thu, 11 Aug 2005 22:31:15 +0000 (15:31 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 29 Aug 2005 22:57:03 +0000 (15:57 -0700)
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

index ac3c61411d4befe398468beaea50bdb7156163a5..189ba67ba6032d4e741adc50624ac2572f3b0730 100644 (file)
@@ -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__