android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ICMP]: Simplify ICMP control socket creation.

Browse Source 
Replace sock_create_kern with inet_ctl_sock_create.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev 2008-04-03 14:29:00 -07:00 committed by David S. Miller
parent 5677242f43
commit c1e9894d48
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
net/ipv4/icmp.c
View File

@ -93,6 +93,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <net/checksum.h> #include <net/checksum.h>
#include <net/xfrm.h> #include <net/xfrm.h>
#include <net/inet_common.h>
/* /*
* Build xmit assembly blocks * Build xmit assembly blocks
@ -1136,7 +1137,7 @@ static void __net_exit icmp_sk_exit(struct net *net)
int i; int i;
for_each_possible_cpu(i) for_each_possible_cpu(i)
sk_release_kernel(net->ipv4.icmp_sk[i]); inet_ctl_sock_destroy(net->ipv4.icmp_sk[i]);
kfree(net->ipv4.icmp_sk); kfree(net->ipv4.icmp_sk);
net->ipv4.icmp_sk = NULL; net->ipv4.icmp_sk = NULL;
} }
@ -1152,17 +1153,13 @@ int __net_init icmp_sk_init(struct net *net)
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
struct sock *sk; struct sock *sk;
struct socket *sock;
struct inet_sock *inet;
err = sock_create_kern(PF_INET, SOCK_RAW, IPPROTO_ICMP, &sock); err = inet_ctl_sock_create(&sk, PF_INET,
SOCK_RAW, IPPROTO_ICMP, net);
if (err < 0) if (err < 0)
goto fail; goto fail;
net->ipv4.icmp_sk[i] = sk = sock->sk; net->ipv4.icmp_sk[i] = sk;
sk_change_net(sk, net);
sk->sk_allocation = GFP_ATOMIC;
/* Enough space for 2 64K ICMP packets, including /* Enough space for 2 64K ICMP packets, including
* sk_buff struct overhead. * sk_buff struct overhead.
@ -1170,15 +1167,7 @@ int __net_init icmp_sk_init(struct net *net)
sk->sk_sndbuf = sk->sk_sndbuf =
(2 * ((64 * 1024) + sizeof(struct sk_buff))); (2 * ((64 * 1024) + sizeof(struct sk_buff)));
inet = inet_sk(sk); inet_sk(sk)->pmtudisc = IP_PMTUDISC_DONT;
inet->uc_ttl = -1;
inet->pmtudisc = IP_PMTUDISC_DONT;
/* Unhash it so that IP input processing does not even
* see it, we do not wish this socket to see incoming
* packets.
*/
sk->sk_prot->unhash(sk);
} }
/* Control parameters for ECHO replies. */ /* Control parameters for ECHO replies. */
@ -1208,7 +1197,7 @@ int __net_init icmp_sk_init(struct net *net)
fail: fail:
for_each_possible_cpu(i) for_each_possible_cpu(i)
sk_release_kernel(net->ipv4.icmp_sk[i]); inet_ctl_sock_destroy(net->ipv4.icmp_sk[i]);
kfree(net->ipv4.icmp_sk); kfree(net->ipv4.icmp_sk);
return err; return err;
} }