diff options
| author |   Eric Dumazet <edumazet@google.com> | 2019-05-31 15:27:00 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-06-03 14:57:41 -0700 |
| commit | 2789c14d198a4890f4c61ac5bf7cb02a14a6f99e (patch) | |
| tree | 68a48826f214a7ecfba2ee4c2bfd05a7e1e0119f /net/ipv6/icmp.c | |
| parent | flow_offload: include linux/kernel.h from flow_offload.h (diff) | |
| download | linux-dev-2789c14d198a4890f4c61ac5bf7cb02a14a6f99e.tar.xz linux-dev-2789c14d198a4890f4c61ac5bf7cb02a14a6f99e.zip | |
ipv6: icmp: use this_cpu_read() in icmpv6_sk()
In general, this_cpu_read(*X) is faster than *this_cpu_ptr(X)
Also remove the inline attibute, totally useless.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/icmp.c')
| -rw-r--r-- | net/ipv6/icmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index afb915807cd0..d274f5b64afe 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -79,9 +79,9 @@ * * On SMP we have one ICMP socket per-cpu. */ -static inline struct sock *icmpv6_sk(struct net *net) +static struct sock *icmpv6_sk(struct net *net) { - return *this_cpu_ptr(net->ipv6.icmp_sk); + return this_cpu_read(*net->ipv6.icmp_sk); } static int icmpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, |