diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-02 10:34:04 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-07-02 10:34:04 -0700 |
| commit | 6fce15cea1145c0359b7103305e215e3e2d1b548 (patch) | |
| tree | fbd021e84fdfd0afb0dd8543246d478d99e2f5be | |
| parent | 3b43f87d2949a340e2c19cb735af7727157d8274 (diff) | |
| parent | c1a534ba0bc58c74bf06e7735c6fb0ffb27a6652 (diff) | |
| download | bionic-6fce15cea1145c0359b7103305e215e3e2d1b548.zip bionic-6fce15cea1145c0359b7103305e215e3e2d1b548.tar.gz bionic-6fce15cea1145c0359b7103305e215e3e2d1b548.tar.bz2 | |
Merge "Regenerate linux/netfilter_ipv6/ip6_tables.h."
| -rw-r--r-- | libc/kernel/common/linux/netfilter_ipv6/ip6_tables.h | 9 | ||||
| -rw-r--r-- | libc/kernel/tools/defaults.py | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6_tables.h b/libc/kernel/common/linux/netfilter_ipv6/ip6_tables.h index 1687e4f..d76a529 100644 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6_tables.h +++ b/libc/kernel/common/linux/netfilter_ipv6/ip6_tables.h @@ -173,6 +173,15 @@ struct ip6t_get_entries #define IP6T_ERROR_TARGET XT_ERROR_TARGET +static __inline__ struct ip6t_entry_target * +ip6t_get_target(struct ip6t_entry *e) +{ + return (void *)e + e->target_offset; +} + #define IP6T_MATCH_ITERATE(e, fn, args...) ({ unsigned int __i; int __ret = 0; struct ip6t_entry_match *__m; for (__i = sizeof(struct ip6t_entry); __i < (e)->target_offset; __i += __m->u.match_size) { __m = (void *)(e) + __i; __ret = fn(__m , ## args); if (__ret != 0) break; } __ret; }) + #define IP6T_ENTRY_ITERATE(entries, size, fn, args...) ({ unsigned int __i; int __ret = 0; struct ip6t_entry *__e; for (__i = 0; __i < (size); __i += __e->next_offset) { __e = (void *)(entries) + __i; __ret = fn(__e , ## args); if (__ret != 0) break; } __ret; }) + #endif + diff --git a/libc/kernel/tools/defaults.py b/libc/kernel/tools/defaults.py index 4227de7..b35f72b 100644 --- a/libc/kernel/tools/defaults.py +++ b/libc/kernel/tools/defaults.py @@ -71,6 +71,7 @@ kernel_known_generic_statics = set( "__cmsg_nxthdr", # linux/socket.h "cmsg_nxthdr", # linux/socket.h "ipt_get_target", + "ip6t_get_target", ] ) |