[PATCH 2/2] fix NF_QUEUE_NR() macro

2005-08-11 Thread Harald Welte
Hi Dave, please apply! -- - Harald Welte <[EMAIL PROTECTED]> http://gnumonks.org/ "Privacy in residential applications is a desirable marketing option."

Re: [PATCH 2/2] fix NF_QUEUE_NR() macro

2005-08-11 Thread Ingo Oeser
Harald Welte wrote: > Hi Dave, please apply! 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 0x > #define NF_VERDICT_QBITS 16

Re: [PATCH 2/2] fix NF_QUEUE_NR() macro

2005-08-11 Thread Harald Welte
On Thu, Aug 11, 2005 at 04:31:24PM +0200, Ingo Oeser wrote: > Harald Welte wrote: > > Hi Dave, please apply! > > What about using a brace more: I wouldn't mind the extra brace, but I don't want to make this more difficult for Dave. So it's his call whether he would manually edit the line before

Re: [PATCH 2/2] fix NF_QUEUE_NR() macro

2005-08-11 Thread Herbert Xu
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 0x >> #define NF_VERDICT_QBIT

Re: [PATCH 2/2] fix NF_QUEUE_NR() macro

2005-08-11 Thread David S. Miller
From: Harald Welte <[EMAIL PROTECTED]> Date: Thu, 11 Aug 2005 09:13:21 +0200 > [NETFILTER] Fix NF_QUEUE_NR() macro > > I obviously wanted to use bitwise-or, not logical or. > > Signed-off-by: Harald Welte <[EMAIL PROTECTED]> Applied. - To unsubscribe from this list: send the line "unsubscribe n

Re: [PATCH 2/2] fix NF_QUEUE_NR() macro

2005-08-11 Thread David S. Miller
From: Herbert Xu <[EMAIL PROTECTED]> Date: Fri, 12 Aug 2005 07:46:55 +1000 > 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? It's the forme

Re: [PATCH 2/2] fix NF_QUEUE_NR() macro

2005-08-11 Thread Harald Welte
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,