Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5917ed961def82a4dba9198d11a75f79d115a8cb

Authored by Harald Welte
Committed by David S. Miller
1 parent 622439270c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

include/linux/netfilter.h
Diff comments   View file @ 5917ed9
... ... @@ -29,7 +29,7 @@
29 29 #define NF_VERDICT_QMASK 0xffff0000
30 30 #define NF_VERDICT_QBITS 16
31 31  
32   -#define NF_QUEUE_NR(x) ((x << NF_VERDICT_QBITS) & NF_VERDICT_QMASK || NF_QUEUE)
  32 +#define NF_QUEUE_NR(x) ((x << NF_VERDICT_QBITS) & NF_VERDICT_QMASK | NF_QUEUE)
33 33  
34 34 /* only for userspace compatibility */
35 35 #ifndef __KERNEL__