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__