diff options
author | Ben Cheng <bccheng@google.com> | 2012-03-07 16:14:53 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 16:14:53 -0800 |
commit | 4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd (patch) | |
tree | 81138dd64a4b9ea18c3cfd5c69783add6deeb201 /libc/kernel/common/linux/icmp.h | |
parent | 94a85f663694e1869acb1c2e8a3c374a6fa3ab86 (diff) | |
download | bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.zip bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.tar.gz bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.tar.bz2 |
Revert "Update bionic kernel headers using update_all.py"
This reverts commit 94a85f663694e1869acb1c2e8a3c374a6fa3ab86
There is a smoke test failure for Prime but Crespo/Stingray are fine. Will revert the change for now until further investigation is made.
Diffstat (limited to 'libc/kernel/common/linux/icmp.h')
-rw-r--r-- | libc/kernel/common/linux/icmp.h | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/libc/kernel/common/linux/icmp.h b/libc/kernel/common/linux/icmp.h index 3a2580e..c5b58bb 100644 --- a/libc/kernel/common/linux/icmp.h +++ b/libc/kernel/common/linux/icmp.h @@ -7,88 +7,75 @@ *** structures, and macros generated from the original header, and thus, *** contains no copyrightable information. *** - *** To edit the content of this header, modify the corresponding - *** source file (e.g. under external/kernel-headers/original/) then - *** run bionic/libc/kernel/tools/update_all.py - *** - *** Any manual change here will be lost the next time this script will - *** be run. You've been warned! - *** **************************************************************************** ****************************************************************************/ #ifndef _LINUX_ICMP_H #define _LINUX_ICMP_H + #include <linux/types.h> + #define ICMP_ECHOREPLY 0 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ICMP_DEST_UNREACH 3 #define ICMP_SOURCE_QUENCH 4 #define ICMP_REDIRECT 5 #define ICMP_ECHO 8 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ICMP_TIME_EXCEEDED 11 #define ICMP_PARAMETERPROB 12 #define ICMP_TIMESTAMP 13 #define ICMP_TIMESTAMPREPLY 14 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ICMP_INFO_REQUEST 15 #define ICMP_INFO_REPLY 16 #define ICMP_ADDRESS 17 #define ICMP_ADDRESSREPLY 18 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define NR_ICMP_TYPES 18 + #define ICMP_NET_UNREACH 0 #define ICMP_HOST_UNREACH 1 #define ICMP_PROT_UNREACH 2 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ICMP_PORT_UNREACH 3 #define ICMP_FRAG_NEEDED 4 #define ICMP_SR_FAILED 5 #define ICMP_NET_UNKNOWN 6 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ICMP_HOST_UNKNOWN 7 #define ICMP_HOST_ISOLATED 8 #define ICMP_NET_ANO 9 #define ICMP_HOST_ANO 10 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ICMP_NET_UNR_TOS 11 #define ICMP_HOST_UNR_TOS 12 #define ICMP_PKT_FILTERED 13 #define ICMP_PREC_VIOLATION 14 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ICMP_PREC_CUTOFF 15 #define NR_ICMP_UNREACH 15 + #define ICMP_REDIR_NET 0 #define ICMP_REDIR_HOST 1 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ICMP_REDIR_NETTOS 2 #define ICMP_REDIR_HOSTTOS 3 + #define ICMP_EXC_TTL 0 #define ICMP_EXC_FRAGTIME 1 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct icmphdr { __u8 type; __u8 code; __u16 checksum; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ union { struct { __u16 id; __u16 sequence; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ } echo; __u32 gateway; struct { __u16 __unused_field; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u16 mtu; } frag; } un; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #define ICMP_FILTER 1 + struct icmp_filter { __u32 data; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #endif |