diff options
| author | Patrick McHardy <kaber@coreworks.de> | 2004-10-24 20:11:28 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@coreworks.de> | 2004-10-24 20:11:28 +0200 |
| commit | b2928fbacc8ab94d439c2a0e034764ca75d8f3ba (patch) | |
| tree | 6eae64954a11925fc9f78b7f606e4e0a6e47a9fa /include/linux | |
| parent | 4b684d78690cf62ccdffed4180d45884fb261b2e (diff) | |
| parent | e1d8928e044412f48cb4eb6379908b5935f66ec3 (diff) | |
Merge coreworks.de:/home/kaber/src/bk-repos/net-2.6
into coreworks.de:/home/kaber/src/nf/nf-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter_ipv6/ip6_tables.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h index 6f70cf3df39a..d6ac08c14dc1 100644 --- a/include/linux/netfilter_ipv6/ip6_tables.h +++ b/include/linux/netfilter_ipv6/ip6_tables.h @@ -355,13 +355,15 @@ struct ip6t_match /* Return true or false: return FALSE and set *hotdrop = 1 to force immediate packet drop. */ + /* Arguments changed since 2.6.9, as this must now handle + non-linear skb, using skb_header_pointer and + skb_ip_make_writable. */ int (*match)(const struct sk_buff *skb, const struct net_device *in, const struct net_device *out, const void *matchinfo, int offset, - const void *hdr, - u_int16_t datalen, + unsigned int protoff, int *hotdrop); /* Called when user tries to insert an entry of this type. */ @@ -386,11 +388,13 @@ struct ip6t_target const char name[IP6T_FUNCTION_MAXNAMELEN]; - /* Returns verdict. */ + /* Returns verdict. Argument order changed since 2.6.9, as this + must now handle non-linear skbs, using skb_copy_bits and + skb_ip_make_writable. */ unsigned int (*target)(struct sk_buff **pskb, - unsigned int hooknum, const struct net_device *in, const struct net_device *out, + unsigned int hooknum, const void *targinfo, void *userdata); |