2 files changed, 16 insertions, 11 deletions

diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index ef4a403878a3..8f2cbb965f3d 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -172,6 +172,10 @@ static inline void nf_ct_put(struct nf_conn *ct)
 extern int nf_ct_l3proto_try_module_get(unsigned short l3proto);
 extern void nf_ct_l3proto_module_put(unsigned short l3proto);
 
+extern struct hlist_head *nf_ct_alloc_hashtable(int *sizep, int *vmalloced);
+extern void nf_ct_free_hashtable(struct hlist_head *hash, int vmalloced,
+                                 int size);
+
 extern struct nf_conntrack_tuple_hash *
 __nf_conntrack_find(const struct nf_conntrack_tuple *tuple,
                     const struct nf_conn *ignored_conntrack);
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 8ed761cc0819..f4c3039728dc 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -920,8 +920,7 @@ static int kill_all(struct nf_conn *i, void *data)
         return 1;
 }
 
-static void free_conntrack_hash(struct hlist_head *hash, int vmalloced,
-                                int size)
+void nf_ct_free_hashtable(struct hlist_head *hash, int vmalloced, int size)
 {
         if (vmalloced)
                 vfree(hash);
@@ -929,6 +928,7 @@ static void free_conntrack_hash(struct hlist_head *hash, int vmalloced,
                 free_pages((unsigned long)hash,
                            get_order(sizeof(struct hlist_head) * size));
 }
+EXPORT_SYMBOL_GPL(nf_ct_free_hashtable);
 
 void nf_conntrack_flush(void)
 {
@@ -962,14 +962,14 @@ void nf_conntrack_cleanup(void)
 
         kmem_cache_destroy(nf_conntrack_cachep);
         kmem_cache_destroy(nf_conntrack_expect_cachep);
-        free_conntrack_hash(nf_conntrack_hash, nf_conntrack_vmalloc,
-                            nf_conntrack_htable_size);
+        nf_ct_free_hashtable(nf_conntrack_hash, nf_conntrack_vmalloc,
+                             nf_conntrack_htable_size);
 
         nf_conntrack_proto_fini();
         nf_conntrack_helper_fini();
 }
 
-static struct hlist_head *alloc_hashtable(int *sizep, int *vmalloced)
+struct hlist_head *nf_ct_alloc_hashtable(int *sizep, int *vmalloced)
 {
         struct hlist_head *hash;
         unsigned int size, i;
@@ -992,6 +992,7 @@ static struct hlist_head *alloc_hashtable(int *sizep, int *vmalloced)
 
         return hash;
 }
+EXPORT_SYMBOL_GPL(nf_ct_alloc_hashtable);
 
 int set_hashsize(const char *val, struct kernel_param *kp)
 {
@@ -1009,7 +1010,7 @@ int set_hashsize(const char *val, struct kernel_param *kp)
         if (!hashsize)
                 return -EINVAL;
 
-        hash = alloc_hashtable(&hashsize, &vmalloced);
+        hash = nf_ct_alloc_hashtable(&hashsize, &vmalloced);
         if (!hash)
                 return -ENOMEM;
 
@@ -1037,7 +1038,7 @@ int set_hashsize(const char *val, struct kernel_param *kp)
         nf_conntrack_hash_rnd = rnd;
         write_unlock_bh(&nf_conntrack_lock);
 
-        free_conntrack_hash(old_hash, old_vmalloced, old_size);
+        nf_ct_free_hashtable(old_hash, old_vmalloced, old_size);
         return 0;
 }
 
@@ -1066,8 +1067,8 @@ int __init nf_conntrack_init(void)
                  * entries. */
                 max_factor = 4;
         }
-        nf_conntrack_hash = alloc_hashtable(&nf_conntrack_htable_size,
-                                            &nf_conntrack_vmalloc);
+        nf_conntrack_hash = nf_ct_alloc_hashtable(&nf_conntrack_htable_size,
+                                                  &nf_conntrack_vmalloc);
         if (!nf_conntrack_hash) {
                 printk(KERN_ERR "Unable to create nf_conntrack_hash\n");
                 goto err_out;
@@ -1122,8 +1123,8 @@ out_free_expect_slab:
 err_free_conntrack_slab:
         kmem_cache_destroy(nf_conntrack_cachep);
 err_free_hash:
-        free_conntrack_hash(nf_conntrack_hash, nf_conntrack_vmalloc,
-                            nf_conntrack_htable_size);
+        nf_ct_free_hashtable(nf_conntrack_hash, nf_conntrack_vmalloc,
+                             nf_conntrack_htable_size);
 err_out:
         return -ENOMEM;
 }