diff options
author | Abhijit Pawar <abhi.c.pawar@gmail.com> | 2012-12-09 18:12:28 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-10 14:09:00 -0500 |
commit | 4b5511ebc7e1cf94e4f13be19c2cf3e90edc3395 (patch) | |
tree | e6882f930d0952aa08162fba55b166a87cebf410 /net/netfilter | |
parent | 008d4278072216bd2459a6e41b07b688fe95ee83 (diff) |
net: remove obsolete simple_strto<foo>
This patch replace the obsolete simple_strto<foo> with kstrto<foo>
Signed-off-by: Abhijit Pawar <abhi.c.pawar@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/nf_conntrack_core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index af175166fff..37d9e628106 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
@@ -1409,7 +1409,7 @@ EXPORT_SYMBOL_GPL(nf_ct_alloc_hashtable); | |||
1409 | 1409 | ||
1410 | int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp) | 1410 | int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp) |
1411 | { | 1411 | { |
1412 | int i, bucket; | 1412 | int i, bucket, rc; |
1413 | unsigned int hashsize, old_size; | 1413 | unsigned int hashsize, old_size; |
1414 | struct hlist_nulls_head *hash, *old_hash; | 1414 | struct hlist_nulls_head *hash, *old_hash; |
1415 | struct nf_conntrack_tuple_hash *h; | 1415 | struct nf_conntrack_tuple_hash *h; |
@@ -1423,6 +1423,9 @@ int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp) | |||
1423 | return param_set_uint(val, kp); | 1423 | return param_set_uint(val, kp); |
1424 | 1424 | ||
1425 | hashsize = simple_strtoul(val, NULL, 0); | 1425 | hashsize = simple_strtoul(val, NULL, 0); |
1426 | rc = kstrtouint(val, 0, &hashsize); | ||
1427 | if (rc) | ||
1428 | return rc; | ||
1426 | if (!hashsize) | 1429 | if (!hashsize) |
1427 | return -EINVAL; | 1430 | return -EINVAL; |
1428 | 1431 | ||