diff options
author | David S. Miller <davem@davemloft.net> | 2012-04-10 20:38:31 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-10 20:38:31 +0200 |
commit | ecd159fc5f415fa742d5daa5b43200606e6ad493 (patch) | |
tree | 3f2996088bdf0d275d6b5fdb3cc184f80a12e21f /include | |
parent | Make the "word-at-a-time" helper functions more commonly usable (diff) | |
parent | netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net (diff) | |
download | linux-ecd159fc5f415fa742d5daa5b43200606e6ad493.tar.xz linux-ecd159fc5f415fa742d5daa5b43200606e6ad493.zip |
Merge branch 'master' of git://1984.lsi.us.es/net
Diffstat (limited to 'include')
-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 f549adccc94c..1bc898b14a80 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); |