aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/nf_conntrack_proto_dccp.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-02-15 17:45:08 +0100
committerPatrick McHardy <kaber@trash.net>2010-02-15 17:45:08 +0100
commit8fea97ec1772bbf553d89187340ef624d548e115 (patch)
treec9f3936e346e388629e735538849b2102162478a /net/netfilter/nf_conntrack_proto_dccp.c
parentd5d1baa15f5b05e9110403724d5dc72d6d541e04 (diff)
downloadkernel_samsung_smdk4412-8fea97ec1772bbf553d89187340ef624d548e115.zip
kernel_samsung_smdk4412-8fea97ec1772bbf553d89187340ef624d548e115.tar.gz
kernel_samsung_smdk4412-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/netfilter/nf_conntrack_proto_dccp.c')
-rw-r--r--net/netfilter/nf_conntrack_proto_dccp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
index dd37550..9a28155 100644
--- a/net/netfilter/nf_conntrack_proto_dccp.c
+++ b/net/netfilter/nf_conntrack_proto_dccp.c
@@ -561,8 +561,9 @@ static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb,
return NF_ACCEPT;
}
-static int dccp_error(struct net *net, struct sk_buff *skb,
- unsigned int dataoff, enum ip_conntrack_info *ctinfo,
+static int dccp_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)
{
struct dccp_hdr _dh, *dh;