net: use this_cpu_ptr()

use this_cpu_ptr(p) instead of per_cpu_ptr(p, smp_processor_id())

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/flow.c b/net/core/flow.c
index 161900674009d832752a2b3929586b53522f064f..8c7c91a32f182b0fc6e1e0f59b766e4fb8169693 100644 (file)
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -222,7 +222,7 @@ flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
        unsigned int hash;
 
        local_bh_disable();
-       fcp = per_cpu_ptr(fc->percpu, smp_processor_id());
+       fcp = this_cpu_ptr(fc->percpu);
 
        fle = NULL;
        flo = NULL;
@@ -302,7 +302,7 @@ static void flow_cache_flush_tasklet(unsigned long data)
        LIST_HEAD(gc_list);
        int i, deleted = 0;
 
-       fcp = per_cpu_ptr(fc->percpu, smp_processor_id());
+       fcp = this_cpu_ptr(fc->percpu);
        for (i = 0; i < flow_cache_hash_size(fc); i++) {
                hlist_for_each_entry_safe(fle, entry, tmp,
                                          &fcp->hash_table[i], u.hlist) {

diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index db47a5a00ed2239a28bc19947ae6bbe95fe396cb..d859bcc26cb7e568b60261e8a0703add32a92798 100644 (file)
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -342,7 +342,7 @@ static int ip_rcv_finish(struct sk_buff *skb)
 
 #ifdef CONFIG_NET_CLS_ROUTE
        if (unlikely(skb_dst(skb)->tclassid)) {
-               struct ip_rt_acct *st = per_cpu_ptr(ip_rt_acct, smp_processor_id());
+               struct ip_rt_acct *st = this_cpu_ptr(ip_rt_acct);
                u32 idx = skb_dst(skb)->tclassid;
                st[idx&0xFF].o_packets++;
                st[idx&0xFF].o_bytes += skb->len;

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index d5f84bd5a45508df46871ed52be1e36aa26157ad..4e6ddfbab09eb86dce78c7c173b632f936f9d5a8 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2962,7 +2962,7 @@ struct tcp_md5sig_pool *tcp_get_md5sig_pool(void)
        spin_unlock(&tcp_md5sig_pool_lock);
 
        if (p)
-               return *per_cpu_ptr(p, smp_processor_id());
+               return *this_cpu_ptr(p);
 
        local_bh_enable();
        return NULL;