diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-02-29 20:14:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-29 20:14:50 +0100 |
| commit | a5710d6582868a96cf0fe02eac11d34cfbc783c9 (patch) | |
| tree | 8fcc3f4bc58436c1809602a98c9ce759c74f9410 /include | |
| parent | [INET]: Remove struct net_proto_family* from _init calls. (diff) | |
| download | linux-a5710d6582868a96cf0fe02eac11d34cfbc783c9.tar.xz linux-a5710d6582868a96cf0fe02eac11d34cfbc783c9.zip | |
[ICMP]: Add return code to icmp_init.
icmp_init could fail and this is normal for namespace other than initial.
So, the panic should be triggered only on init_net initialization path.
Additionally create rollback path for icmp_init as a separate function.
It will also be used later during namespace destruction.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/icmp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/icmp.h b/include/net/icmp.h index 7bf714d9d7c7..faba64db8ff0 100644 --- a/include/net/icmp.h +++ b/include/net/icmp.h @@ -48,7 +48,7 @@ struct sk_buff; extern void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info); extern int icmp_rcv(struct sk_buff *skb); extern int icmp_ioctl(struct sock *sk, int cmd, unsigned long arg); -extern void icmp_init(void); +extern int icmp_init(void); extern void icmp_out_count(unsigned char type); /* Move into dst.h ? */ |