diff options
| author | Ben Cheng <bccheng@google.com> | 2012-03-07 16:16:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 16:16:10 -0800 |
| commit | 36c8c1039fca1c338796c4a8951c31e4fdf1d3b9 (patch) | |
| tree | fc661a73e7311d4b2cfceb47f3eb9228e16ab96b /libc/kernel/common/linux/if_addr.h | |
| parent | 27a5923b24a7f0a1a75498bcb6771f380b681e09 (diff) | |
| parent | 4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd (diff) | |
| download | android_bionic-36c8c1039fca1c338796c4a8951c31e4fdf1d3b9.tar.gz android_bionic-36c8c1039fca1c338796c4a8951c31e4fdf1d3b9.tar.bz2 android_bionic-36c8c1039fca1c338796c4a8951c31e4fdf1d3b9.zip | |
Merge "Revert "Update bionic kernel headers using update_all.py""
Diffstat (limited to 'libc/kernel/common/linux/if_addr.h')
| -rw-r--r-- | libc/kernel/common/linux/if_addr.h | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/libc/kernel/common/linux/if_addr.h b/libc/kernel/common/linux/if_addr.h index 05517a22c..9c1fa15a4 100644 --- a/libc/kernel/common/linux/if_addr.h +++ b/libc/kernel/common/linux/if_addr.h @@ -7,67 +7,58 @@ *** 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_IF_ADDR_H #define __LINUX_IF_ADDR_H + #include <linux/types.h> #include <linux/netlink.h> -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct ifaddrmsg { __u8 ifa_family; __u8 ifa_prefixlen; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u8 ifa_flags; __u8 ifa_scope; __u32 ifa_index; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + enum { IFA_UNSPEC, IFA_ADDRESS, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ IFA_LOCAL, IFA_LABEL, IFA_BROADCAST, IFA_ANYCAST, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ IFA_CACHEINFO, IFA_MULTICAST, __IFA_MAX, }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #define IFA_MAX (__IFA_MAX - 1) + #define IFA_F_SECONDARY 0x01 #define IFA_F_TEMPORARY IFA_F_SECONDARY + #define IFA_F_NODAD 0x02 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define IFA_F_OPTIMISTIC 0x04 #define IFA_F_DADFAILED 0x08 #define IFA_F_HOMEADDRESS 0x10 #define IFA_F_DEPRECATED 0x20 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define IFA_F_TENTATIVE 0x40 #define IFA_F_PERMANENT 0x80 + struct ifa_cacheinfo { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 ifa_prefered; __u32 ifa_valid; __u32 cstamp; __u32 tstamp; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; + #define IFA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg)))) #define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg)) + #endif -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ |