diff options
author | Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2007-07-08 01:25:51 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-11 01:17:35 -0400 |
commit | dacd2a1a5cf621288833aa3c6e815b86a1536538 (patch) | |
tree | c615b95aa1518c6518df35acd481ed4af19acd61 /net/netfilter/nf_conntrack_l3proto_generic.c | |
parent | ff09b7493c8f433d3ffd6a31ad58d190f82ef0c5 (diff) |
[NETFILTER]: nf_conntrack: remove old memory allocator of conntrack
Now memory space for help and NAT are allocated by extension
infrastructure.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_l3proto_generic.c')
-rw-r--r-- | net/netfilter/nf_conntrack_l3proto_generic.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/netfilter/nf_conntrack_l3proto_generic.c b/net/netfilter/nf_conntrack_l3proto_generic.c index cbd96f3c1b8..2fd0f11b8fb 100644 --- a/net/netfilter/nf_conntrack_l3proto_generic.c +++ b/net/netfilter/nf_conntrack_l3proto_generic.c | |||
@@ -76,12 +76,6 @@ generic_prepare(struct sk_buff **pskb, unsigned int hooknum, | |||
76 | } | 76 | } |
77 | 77 | ||
78 | 78 | ||
79 | static u_int32_t generic_get_features(const struct nf_conntrack_tuple *tuple) | ||
80 | |||
81 | { | ||
82 | return NF_CT_F_BASIC; | ||
83 | } | ||
84 | |||
85 | struct nf_conntrack_l3proto nf_conntrack_l3proto_generic = { | 79 | struct nf_conntrack_l3proto nf_conntrack_l3proto_generic = { |
86 | .l3proto = PF_UNSPEC, | 80 | .l3proto = PF_UNSPEC, |
87 | .name = "unknown", | 81 | .name = "unknown", |
@@ -90,6 +84,5 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_generic = { | |||
90 | .print_tuple = generic_print_tuple, | 84 | .print_tuple = generic_print_tuple, |
91 | .print_conntrack = generic_print_conntrack, | 85 | .print_conntrack = generic_print_conntrack, |
92 | .prepare = generic_prepare, | 86 | .prepare = generic_prepare, |
93 | .get_features = generic_get_features, | ||
94 | }; | 87 | }; |
95 | EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_generic); | 88 | EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_generic); |