On Fri, Aug 12, 2005 at 07:46:55AM +1000, Herbert Xu wrote: > Ingo Oeser <[EMAIL PROTECTED]> wrote: > > > > What about using a brace more: > > > >>diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h > >>--- 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) > > > > #define NF_QUEUE_NR(x) ((x << NF_VERDICT_QBITS) & (NF_VERDICT_QMASK | > > NF_QUEUE)) > > Actually, these two versions are different. & is higher than | so > Harald's version is actually > > #define NF_QUEUE_NR(x) (((x << NF_VERDICT_QBITS) & NF_VERDICT_QMASK) | > NF_QUEUE) > > Which is it?
the latter. So my original patch is right (and is also confirmed to work in tests by some users and myself), I 'just' didn't review Ingo's alternative line (embarrassing). We have that saying in german: "I didn't see the wood because of all the trees". Somehow I feel like that now... -- - Harald Welte <[EMAIL PROTECTED]> http://netfilter.org/ ============================================================================ "Fragmentation is like classful addressing -- an interesting early architectural error that shows how much experimentation was going on while IP was being designed." -- Paul Vixie
pgpZyZ608FBZ4.pgp
Description: PGP signature
