aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
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/ipv4
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/ipv4')
-rw-r--r--net/ipv4/netfilter/nf_conntrack_proto_icmp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
index 7afd39b5b78..327826a968a 100644
--- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
+++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
@@ -163,7 +163,8 @@ icmp_error_message(struct net *net, struct sk_buff *skb,
163 163
164/* Small and modified version of icmp_rcv */ 164/* Small and modified version of icmp_rcv */
165static int 165static int
166icmp_error(struct net *net, struct sk_buff *skb, unsigned int dataoff, 166icmp_error(struct net *net, struct nf_conn *tmpl,
167 struct sk_buff *skb, unsigned int dataoff,
167 enum ip_conntrack_info *ctinfo, u_int8_t pf, unsigned int hooknum) 168 enum ip_conntrack_info *ctinfo, u_int8_t pf, unsigned int hooknum)
168{ 169{
169 const struct icmphdr *icmph; 170 const struct icmphdr *icmph;