generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 424d027b: merge from open-source master

Browse Source 
Merge commit '424d027b6e9b2fff2e79b2d65575c00fcf67d915'

* commit '424d027b6e9b2fff2e79b2d65575c00fcf67d915':
  Regenerate linux/netfilter_ipv6/ip6_tables.h.
This commit is contained in:
The Android Open Source Project 2010-07-02 11:43:48 -07:00 committed by Android Git Automerger
commit cd122865a5
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libc/kernel/common/linux/netfilter_ipv6/ip6_tables.h
View File

@ -173,6 +173,15 @@ struct ip6t_get_entries
#define IP6T_ERROR_TARGET XT_ERROR_TARGET #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_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; }) #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 #endif

1
libc/kernel/tools/defaults.py
View File

@ -71,6 +71,7 @@ kernel_known_generic_statics = set(
"__cmsg_nxthdr", # linux/socket.h "__cmsg_nxthdr", # linux/socket.h
"cmsg_nxthdr", # linux/socket.h "cmsg_nxthdr", # linux/socket.h
"ipt_get_target", "ipt_get_target",
"ip6t_get_target",
] ]
) )