[NETFILTER]: nf_conntrack: make l3proto->prepare() generic and renames it

[safe/jmp/linux-2.6] / net / netfilter / nf_conntrack_l3proto_generic.c

diff --git a/net/netfilter/nf_conntrack_l3proto_generic.c b/net/netfilter/nf_conntrack_l3proto_generic.c
index b1bfa20..0691642 100644 (file)
--- a/net/netfilter/nf_conntrack_l3proto_generic.c
+++ b/net/netfilter/nf_conntrack_l3proto_generic.c
@@ -61,9 +61,8 @@ static int generic_print_conntrack(struct seq_file *s,
        return 0;
 }
 
-static int
-generic_prepare(struct sk_buff **pskb, unsigned int hooknum,
-               unsigned int *dataoff, u_int8_t *protonum)
+static int generic_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
+                              unsigned int *dataoff, u_int8_t *protonum)
 {
        /* Never track !!! */
        return -NF_ACCEPT;
@@ -77,6 +76,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_generic = {
        .invert_tuple    = generic_invert_tuple,
        .print_tuple     = generic_print_tuple,
        .print_conntrack = generic_print_conntrack,
-       .prepare         = generic_prepare,
+       .get_l4proto     = generic_get_l4proto,
 };
 EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_generic);