ipv4: icmp: use percpu allocation
authorEric Dumazet <edumazet@google.com>
Thu, 29 Jan 2015 23:58:09 +0000 (15:58 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 1 Feb 2015 01:48:18 +0000 (17:48 -0800)
Get rid of nr_cpu_ids and use modern percpu allocation.

Note that the sockets themselves are not yet allocated
using NUMA affinity.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/netns/ipv4.h
net/ipv4/icmp.c

index 24945ce..7283f4d 100644 (file)
@@ -48,7 +48,8 @@ struct netns_ipv4 {
        struct hlist_head       *fib_table_hash;
        struct sock             *fibnl;
 
-       struct sock             **icmp_sk;
+       struct sock  * __percpu *icmp_sk;
+
        struct inet_peer_base   *peers;
        struct tcpm_hash_bucket *tcp_metrics_hash;
        unsigned int            tcp_metrics_hash_log;
diff --cc net/ipv4/icmp.c
Simple merge