[PATCH 1/2] netfilter: nf_tables: nft_queue does not depend on x_tables

[PATCH 1/2] netfilter: nf_tables: nft_queue does not depend on x_tables

[Patrick McHardy]

Signed-off-by: Patrick McHardy <kaber@trash.net>
---
 net/netfilter/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 971cd75..f70e34a 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -522,7 +522,6 @@ config NFT_NAT
 	  typical Network Address Translation (NAT) packet transformations.
 
 config NFT_QUEUE
-	depends on NETFILTER_XTABLES
 	depends on NETFILTER_NETLINK_QUEUE
 	tristate "Netfilter nf_tables queue module"
 	help
-- 
2.1.0

[PATCH 2/2] netfilter: nft_meta: use raw_smp_processor_id()

[Patrick McHardy]

Using smp_processor_id() triggers warnings with PREEMPT_RCU. There is no
point in disabling preemption since we only collect the numeric value,
so use raw_smp_processor_id() instead.

Signed-off-by: Patrick McHardy <kaber@trash.net>
---
 net/netfilter/nft_meta.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index abe6811..5197874 100644
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -153,7 +153,7 @@ void nft_meta_get_eval(const struct nft_expr *expr,
 		}
 		break;
 	case NFT_META_CPU:
-		dest->data[0] = smp_processor_id();
+		dest->data[0] = raw_smp_processor_id();
 		break;
 	case NFT_META_IIFGROUP:
 		if (in == NULL)
-- 
2.1.0

Re: [PATCH 1/2] netfilter: nf_tables: nft_queue does not depend on x_tables

[Pablo Neira Ayuso]

Applied, thanks Patrick.

Re: [PATCH 2/2] netfilter: nft_meta: use raw_smp_processor_id()

[Pablo Neira Ayuso]

On Wed, Mar 25, 2015 at 08:09:56AM +0000, Patrick McHardy wrote:
> Using smp_processor_id() triggers warnings with PREEMPT_RCU. There is no
> point in disabling preemption since we only collect the numeric value,
> so use raw_smp_processor_id() instead.

Also applied, thanks.