* [PATCH net-next] netfilter: conntrack: Fix UP builds
@ 2014-03-17 20:37 Eric Dumazet
2014-03-17 21:15 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Eric Dumazet @ 2014-03-17 20:37 UTC (permalink / raw)
To: David Miller; +Cc: Jesper Dangaard Brouer, Pablo Neira Ayuso, netdev
From: Eric Dumazet <edumazet@google.com>
ARRAY_SIZE(nf_conntrack_locks) is undefined if spinlock_t is an
empty structure. Replace it by CONNTRACK_LOCKS
Fixes: 93bb0ceb75be ("netfilter: conntrack: remove central spinlock nf_conntrack_lock")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
---
David, you might merge this asap instead of going through Pablo queue ?
net/netfilter/nf_conntrack_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 5d1e7d126ebd..6dba48efe01e 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1674,7 +1674,7 @@ int nf_conntrack_init_start(void)
int max_factor = 8;
int i, ret, cpu;
- for (i = 0; i < ARRAY_SIZE(nf_conntrack_locks); i++)
+ for (i = 0; i < CONNTRACK_LOCKS; i++)
spin_lock_init(&nf_conntrack_locks[i]);
/* Idea from tcp.c: use 1/16384 of memory. On i386: 32MB
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] netfilter: conntrack: Fix UP builds
2014-03-17 20:37 [PATCH net-next] netfilter: conntrack: Fix UP builds Eric Dumazet
@ 2014-03-17 21:15 ` David Miller
2014-03-18 7:15 ` Jesper Dangaard Brouer
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2014-03-17 21:15 UTC (permalink / raw)
To: eric.dumazet; +Cc: brouer, pablo, netdev
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 17 Mar 2014 13:37:53 -0700
> From: Eric Dumazet <edumazet@google.com>
>
> ARRAY_SIZE(nf_conntrack_locks) is undefined if spinlock_t is an
> empty structure. Replace it by CONNTRACK_LOCKS
>
> Fixes: 93bb0ceb75be ("netfilter: conntrack: remove central spinlock nf_conntrack_lock")
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Jesper Dangaard Brouer <brouer@redhat.com>
> Cc: Pablo Neira Ayuso <pablo@netfilter.org>
> ---
> David, you might merge this asap instead of going through Pablo queue ?
Sure, applied, thanks Eric.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net-next] netfilter: conntrack: Fix UP builds
2014-03-17 21:15 ` David Miller
@ 2014-03-18 7:15 ` Jesper Dangaard Brouer
0 siblings, 0 replies; 3+ messages in thread
From: Jesper Dangaard Brouer @ 2014-03-18 7:15 UTC (permalink / raw)
To: David Miller; +Cc: eric.dumazet, pablo, netdev, brouer
On Mon, 17 Mar 2014 17:15:07 -0400 (EDT)
David Miller <davem@davemloft.net> wrote:
> From: Eric Dumazet <eric.dumazet@gmail.com>
> Date: Mon, 17 Mar 2014 13:37:53 -0700
>
> > From: Eric Dumazet <edumazet@google.com>
> >
> > ARRAY_SIZE(nf_conntrack_locks) is undefined if spinlock_t is an
> > empty structure. Replace it by CONNTRACK_LOCKS
> >
> > Fixes: 93bb0ceb75be ("netfilter: conntrack: remove central spinlock nf_conntrack_lock")
> > Reported-by: kbuild test robot <fengguang.wu@intel.com>
> > Signed-off-by: Eric Dumazet <edumazet@google.com>
> > Cc: Jesper Dangaard Brouer <brouer@redhat.com>
> > Cc: Pablo Neira Ayuso <pablo@netfilter.org>
> > ---
> > David, you might merge this asap instead of going through Pablo queue ?
>
> Sure, applied, thanks Eric.
Thanks for fixing this Eric :-)
--
Best regards,
Jesper Dangaard Brouer
MSc.CS, Sr. Network Kernel Developer at Red Hat
Author of http://www.iptv-analyzer.org
LinkedIn: http://www.linkedin.com/in/brouer
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-18 7:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-17 20:37 [PATCH net-next] netfilter: conntrack: Fix UP builds Eric Dumazet
2014-03-17 21:15 ` David Miller
2014-03-18 7:15 ` Jesper Dangaard Brouer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).