aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/netfilter
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 /include/net/netfilter
parentd5d1baa15f5b05e9110403724d5dc72d6d541e04 (diff)
downloadkernel_samsung_smdk4412-8fea97ec1772bbf553d89187340ef624d548e115.tar.gz
kernel_samsung_smdk4412-8fea97ec1772bbf553d89187340ef624d548e115.tar.bz2
kernel_samsung_smdk4412-8fea97ec1772bbf553d89187340ef624d548e115.zip
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 'include/net/netfilter')
-rw-r--r--include/net/netfilter/nf_conntrack_l4proto.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index ca6dcf3445a..e3d3ee3c06a 100644
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -49,8 +49,8 @@ struct nf_conntrack_l4proto {
/* Called when a conntrack entry is destroyed */
void (*destroy)(struct nf_conn *ct);
- int (*error)(struct net *net, struct sk_buff *skb, unsigned int dataoff,
- enum ip_conntrack_info *ctinfo,
+ int (*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);
/* Print out the per-protocol part of the tuple. Return like seq_* */