diff options
author | Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2007-05-10 17:15:30 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-05-11 02:47:46 -0400 |
commit | fda61436835f6d46b6d85d4fe9206ffe682fe7f0 (patch) | |
tree | 8b569e8b95ee9ac9d435348383f3b4d304b34287 /net | |
parent | c874d5f726ebaa5487d9fb7b057e28c25c4975a2 (diff) |
[NETFILTER]: nf_conntrack: Removes unused destroy operation of l3proto
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')
-rw-r--r-- | net/netfilter/nf_conntrack_core.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index e132c8ae8784..94000a4c7dcf 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
@@ -299,7 +299,6 @@ destroy_conntrack(struct nf_conntrack *nfct) | |||
299 | { | 299 | { |
300 | struct nf_conn *ct = (struct nf_conn *)nfct; | 300 | struct nf_conn *ct = (struct nf_conn *)nfct; |
301 | struct nf_conn_help *help = nfct_help(ct); | 301 | struct nf_conn_help *help = nfct_help(ct); |
302 | struct nf_conntrack_l3proto *l3proto; | ||
303 | struct nf_conntrack_l4proto *l4proto; | 302 | struct nf_conntrack_l4proto *l4proto; |
304 | typeof(nf_conntrack_destroyed) destroyed; | 303 | typeof(nf_conntrack_destroyed) destroyed; |
305 | 304 | ||
@@ -317,10 +316,6 @@ destroy_conntrack(struct nf_conntrack *nfct) | |||
317 | * destroy_conntrack() MUST NOT be called with a write lock | 316 | * destroy_conntrack() MUST NOT be called with a write lock |
318 | * to nf_conntrack_lock!!! -HW */ | 317 | * to nf_conntrack_lock!!! -HW */ |
319 | rcu_read_lock(); | 318 | rcu_read_lock(); |
320 | l3proto = __nf_ct_l3proto_find(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.l3num); | ||
321 | if (l3proto && l3proto->destroy) | ||
322 | l3proto->destroy(ct); | ||
323 | |||
324 | l4proto = __nf_ct_l4proto_find(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.l3num, | 319 | l4proto = __nf_ct_l4proto_find(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.l3num, |
325 | ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.protonum); | 320 | ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.protonum); |
326 | if (l4proto && l4proto->destroy) | 321 | if (l4proto && l4proto->destroy) |