[PATCH 7/11 net-2.6.26] [ICMP]: Simplify ICMP control socket creation.

Arnaldo Carvalho de Melo acme at redhat.com
Fri Mar 28 07:47:26 PDT 2008


Em Fri, Mar 28, 2008 at 12:08:54PM +0300, Denis V. Lunev escreveu:
> Replace sock_create_kern with inet_csk_ctl_sock_create.
> 
> Signed-off-by: Denis V. Lunev <den at openvz.org>
> ---
>  net/ipv4/icmp.c |   23 +++++------------------
>  1 files changed, 5 insertions(+), 18 deletions(-)
> 
> diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
> index 803bc9f..b00bc20 100644
> --- a/net/ipv4/icmp.c
> +++ b/net/ipv4/icmp.c
> @@ -1152,33 +1152,20 @@ int __net_init icmp_sk_init(struct net *net)
>  
>  	for_each_possible_cpu(i) {
>  		struct sock *sk;
> -		struct socket *sock;
> -		struct inet_sock *inet;
>  
> -		err = sock_create_kern(PF_INET, SOCK_RAW, IPPROTO_ICMP, &sock);
> +		err = inet_csk_ctl_sock_create(&sk,
> +					       PF_INET, SOCK_RAW, IPPROTO_ICMP);

And ICMP surely is not a inet_connection_sock, so please rename it as
suggested in another message.

- Arnaldo


More information about the Containers mailing list