From 1149ec9c5c4cd1d090b4434f2d16de0d1c28404a Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Thu, 29 May 2008 03:19:37 -0700 Subject: [PATCH] --- yaml --- r: 97495 b: refs/heads/master c: 12293bf91126ad253a25e2840b307fdc7c2754c3 h: refs/heads/master i: 97493: 6acfbaea01e3c7f83e9a45b0740ca5e7433982b6 97491: 081054c7aa5bf1ab08364007033c1ebee64ef358 97487: f1fec00604a1086376d949ba28cb067f97a3ff83 v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_expect.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a26839bf2640..eca6e5519218 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c3a01d0c259ec8b283c52dbeadda0122582a68b +refs/heads/master: 12293bf91126ad253a25e2840b307fdc7c2754c3 diff --git a/trunk/net/netfilter/nf_conntrack_expect.c b/trunk/net/netfilter/nf_conntrack_expect.c index e31beeb33b2b..e8f0dead267f 100644 --- a/trunk/net/netfilter/nf_conntrack_expect.c +++ b/trunk/net/netfilter/nf_conntrack_expect.c @@ -587,10 +587,10 @@ int __init nf_conntrack_expect_init(void) return 0; err3: + kmem_cache_destroy(nf_ct_expect_cachep); +err2: nf_ct_free_hashtable(nf_ct_expect_hash, nf_ct_expect_vmalloc, nf_ct_expect_hsize); -err2: - kmem_cache_destroy(nf_ct_expect_cachep); err1: return err; }