diff options
| author | David S. Miller <davem@davemloft.net> | 2019-02-24 21:57:26 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-24 21:57:26 -0800 |
| commit | 2bdeb8e5bd7b63cb6a5e341178840fd92f61c4de (patch) | |
| tree | 108b0c8bb7987e7c97f5e9e9cfa4b1153e199769 /include/net | |
| parent | 4ef595cbb3f871620083dcface7a7fb8f2152607 (diff) | |
| parent | 75efc250d2e57c43761890388a92eecd93aa9e45 (diff) | |
| download | linux-2bdeb8e5bd7b63cb6a5e341178840fd92f61c4de.tar.bz2 | |
Merge branch 'ipv4-v6-icmp-small-cleanup-and-update'
Kefeng Wang says:
====================
ipv4/v6: icmp: small cleanup and update
v2:
- Add cover letter and user proper patch subject-prefix suggested-by Eric Dumazet
This patch series contains some small cleanup and update,
1) use icmp/v6_sk_exit when icmp_sk_init fails instead of open-code
2) use new percpu allocation interface for the ipv6.icmp_sk
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netns/ipv6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index ef1ed529f33c..b028a1dc150d 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -83,7 +83,7 @@ struct netns_ipv6 { struct fib6_table *fib6_local_tbl; struct fib_rules_ops *fib6_rules_ops; #endif - struct sock **icmp_sk; + struct sock * __percpu *icmp_sk; struct sock *ndisc_sk; struct sock *tcp_sk; struct sock *igmp_sk; |