summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Welte <laforge@netfilter.org>2005-08-11 15:31:15 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 15:57:03 -0700
commit5917ed961def82a4dba9198d11a75f79d115a8cb (patch)
tree4e7ba1b827e70d60cb6fd42ea18bd618757a8908
parent622439270c74f3ad4f69d1417aca4bb3b79514f4 (diff)
downloadlwn-5917ed961def82a4dba9198d11a75f79d115a8cb.tar.gz
lwn-5917ed961def82a4dba9198d11a75f79d115a8cb.zip
[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>
-rw-r--r--include/linux/netfilter.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index ac3c61411d4b..189ba67ba603 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__