diff options
| author | Colin Cross <ccross@android.com> | 2012-04-19 14:42:22 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-04-19 14:42:22 -0700 |
| commit | ab2965eefef95a2eecfd54c12b0eb243162862e9 (patch) | |
| tree | c947fdc158e144c2d060486b65d10ee67d254039 /include/linux/netfilter_ipv6/ip6_tables.h | |
| parent | a0ec4361e4539e30cf1c5de7ddfd2dadcd8e1595 (diff) | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) | |
Merge commit 'v3.4-rc3' into android-3.4
Conflicts:
drivers/staging/android/lowmemorykiller.c
Change-Id: Ia3ffcfc702e28c4fce0e91b363f4afd5f1c40306
Diffstat (limited to 'include/linux/netfilter_ipv6/ip6_tables.h')
| -rw-r--r-- | include/linux/netfilter_ipv6/ip6_tables.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h index f549adccc94..1bc898b14a8 100644 --- a/include/linux/netfilter_ipv6/ip6_tables.h +++ b/include/linux/netfilter_ipv6/ip6_tables.h @@ -287,7 +287,17 @@ extern unsigned int ip6t_do_table(struct sk_buff *skb, struct xt_table *table); /* Check for an extension */ -extern int ip6t_ext_hdr(u8 nexthdr); +static inline int +ip6t_ext_hdr(u8 nexthdr) +{ return (nexthdr == IPPROTO_HOPOPTS) || + (nexthdr == IPPROTO_ROUTING) || + (nexthdr == IPPROTO_FRAGMENT) || + (nexthdr == IPPROTO_ESP) || + (nexthdr == IPPROTO_AH) || + (nexthdr == IPPROTO_NONE) || + (nexthdr == IPPROTO_DSTOPTS); +} + /* find specified header and get offset to it */ extern int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset, int target, unsigned short *fragoff); |