aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-02-15 11:45:08 -0500
committerPatrick McHardy <kaber@trash.net>2010-02-15 11:45:08 -0500
commit8fea97ec1772bbf553d89187340ef624d548e115 (patch)
treec9f3936e346e388629e735538849b2102162478a /net/ipv6
parentd5d1baa15f5b05e9110403724d5dc72d6d541e04 (diff)
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.c3
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 c7b8bd1d7984..d772dc21857f 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,
179} 179}
180 180
181static int 181static int
182icmpv6_error(struct net *net, struct sk_buff *skb, unsigned int dataoff, 182icmpv6_error(struct net *net, struct nf_conn *tmpl,
183 struct sk_buff *skb, unsigned int dataoff,
183 enum ip_conntrack_info *ctinfo, u_int8_t pf, unsigned int hooknum) 184 enum ip_conntrack_info *ctinfo, u_int8_t pf, unsigned int hooknum)
184{ 185{
185 const struct icmp6hdr *icmp6h; 186 const struct icmp6hdr *icmp6h;