aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/netfilter/nf_conntrack.h4
-rw-r--r--net/netfilter/nf_conntrack_core.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 857d89951790..dada0411abd1 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -171,9 +171,9 @@ static inline void nf_ct_put(struct nf_conn *ct)
171extern int nf_ct_l3proto_try_module_get(unsigned short l3proto); 171extern int nf_ct_l3proto_try_module_get(unsigned short l3proto);
172extern void nf_ct_l3proto_module_put(unsigned short l3proto); 172extern void nf_ct_l3proto_module_put(unsigned short l3proto);
173 173
174extern struct hlist_head *nf_ct_alloc_hashtable(int *sizep, int *vmalloced); 174extern struct hlist_head *nf_ct_alloc_hashtable(unsigned int *sizep, int *vmalloced);
175extern void nf_ct_free_hashtable(struct hlist_head *hash, int vmalloced, 175extern void nf_ct_free_hashtable(struct hlist_head *hash, int vmalloced,
176 int size); 176 unsigned int size);
177 177
178extern struct nf_conntrack_tuple_hash * 178extern struct nf_conntrack_tuple_hash *
179__nf_conntrack_find(const struct nf_conntrack_tuple *tuple, 179__nf_conntrack_find(const struct nf_conntrack_tuple *tuple,
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 078fff0335ad..7b1f7e80f2f8 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -939,7 +939,7 @@ static int kill_all(struct nf_conn *i, void *data)
939 return 1; 939 return 1;
940} 940}
941 941
942void nf_ct_free_hashtable(struct hlist_head *hash, int vmalloced, int size) 942void nf_ct_free_hashtable(struct hlist_head *hash, int vmalloced, unsigned int size)
943{ 943{
944 if (vmalloced) 944 if (vmalloced)
945 vfree(hash); 945 vfree(hash);
@@ -988,7 +988,7 @@ void nf_conntrack_cleanup(void)
988 nf_conntrack_expect_fini(); 988 nf_conntrack_expect_fini();
989} 989}
990 990
991struct hlist_head *nf_ct_alloc_hashtable(int *sizep, int *vmalloced) 991struct hlist_head *nf_ct_alloc_hashtable(unsigned int *sizep, int *vmalloced)
992{ 992{
993 struct hlist_head *hash; 993 struct hlist_head *hash;
994 unsigned int size, i; 994 unsigned int size, i;
@@ -1015,8 +1015,8 @@ EXPORT_SYMBOL_GPL(nf_ct_alloc_hashtable);
1015 1015
1016int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp) 1016int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp)
1017{ 1017{
1018 int i, bucket, hashsize, vmalloced; 1018 int i, bucket, vmalloced, old_vmalloced;
1019 int old_vmalloced, old_size; 1019 unsigned int hashsize, old_size;
1020 int rnd; 1020 int rnd;
1021 struct hlist_head *hash, *old_hash; 1021 struct hlist_head *hash, *old_hash;
1022 struct nf_conntrack_tuple_hash *h; 1022 struct nf_conntrack_tuple_hash *h;
@@ -1025,7 +1025,7 @@ int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp)
1025 if (!nf_conntrack_htable_size) 1025 if (!nf_conntrack_htable_size)
1026 return param_set_uint(val, kp); 1026 return param_set_uint(val, kp);
1027 1027
1028 hashsize = simple_strtol(val, NULL, 0); 1028 hashsize = simple_strtoul(val, NULL, 0);
1029 if (!hashsize) 1029 if (!hashsize)
1030 return -EINVAL; 1030 return -EINVAL;
1031 1031