diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-02-15 17:45:08 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-02-15 17:45:08 +0100 |
| commit | 8fea97ec1772bbf553d89187340ef624d548e115 (patch) | |
| tree | c9f3936e346e388629e735538849b2102162478a /net/ipv6 | |
| parent | d5d1baa15f5b05e9110403724d5dc72d6d541e04 (diff) | |
| download | kernel_samsung_tuna-8fea97ec1772bbf553d89187340ef624d548e115.zip kernel_samsung_tuna-8fea97ec1772bbf553d89187340ef624d548e115.tar.gz kernel_samsung_tuna-8fea97ec1772bbf553d89187340ef624d548e115.tar.bz2 | |
netfilter: nf_conntrack: pass template to l4proto ->error() handler
The error handlers might need the template to get the conntrack zone
introduced in the next patches to perform a conntrack lookup.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c index c7b8bd1..d772dc2 100644 --- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c +++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c @@ -179,7 +179,8 @@ icmpv6_error_message(struct net *net, } static int -icmpv6_error(struct net *net, struct sk_buff *skb, unsigned int dataoff, +icmpv6_error(struct net *net, struct nf_conn *tmpl, + struct sk_buff *skb, unsigned int dataoff, enum ip_conntrack_info *ctinfo, u_int8_t pf, unsigned int hooknum) { const struct icmp6hdr *icmp6h; |