aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2011-09-30 07:32:01 -0400
committerSven Eckelmann <sven@narfation.org>2011-11-20 07:08:31 -0500
commit25a92b138dcd1eb46e82d1afdf03fd787837c019 (patch)
tree582507019cbd35933380a315bc81a23a0824c32a /net/batman-adv
parent87944973d97c8792e3904dab78537cbdfb715cb2 (diff)
batman-adv: Replace obsolete strict_strto<foo> with kstrto<foo>
strict_strto<foo> is obsolete since v3.1-rc8-8466-g14acc55 and should be replaced with kstrto<foo>. Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/bat_sysfs.c4
-rw-r--r--net/batman-adv/gateway_common.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c
index b8a7414c3571..c25492f7d665 100644
--- a/net/batman-adv/bat_sysfs.c
+++ b/net/batman-adv/bat_sysfs.c
@@ -174,7 +174,7 @@ static int store_uint_attr(const char *buff, size_t count,
174 unsigned long uint_val; 174 unsigned long uint_val;
175 int ret; 175 int ret;
176 176
177 ret = strict_strtoul(buff, 10, &uint_val); 177 ret = kstrtoul(buff, 10, &uint_val);
178 if (ret) { 178 if (ret) {
179 bat_info(net_dev, 179 bat_info(net_dev,
180 "%s: Invalid parameter received: %s\n", 180 "%s: Invalid parameter received: %s\n",
@@ -239,7 +239,7 @@ static ssize_t store_vis_mode(struct kobject *kobj, struct attribute *attr,
239 unsigned long val; 239 unsigned long val;
240 int ret, vis_mode_tmp = -1; 240 int ret, vis_mode_tmp = -1;
241 241
242 ret = strict_strtoul(buff, 10, &val); 242 ret = kstrtoul(buff, 10, &val);
243 243
244 if (((count == 2) && (!ret) && (val == VIS_TYPE_CLIENT_UPDATE)) || 244 if (((count == 2) && (!ret) && (val == VIS_TYPE_CLIENT_UPDATE)) ||
245 (strncmp(buff, "client", 6) == 0) || 245 (strncmp(buff, "client", 6) == 0) ||
diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c
index 18661af0bc3b..c4ac7b0a2a63 100644
--- a/net/batman-adv/gateway_common.c
+++ b/net/batman-adv/gateway_common.c
@@ -97,7 +97,7 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff,
97 *tmp_ptr = '\0'; 97 *tmp_ptr = '\0';
98 } 98 }
99 99
100 ret = strict_strtol(buff, 10, &ldown); 100 ret = kstrtol(buff, 10, &ldown);
101 if (ret) { 101 if (ret) {
102 bat_err(net_dev, 102 bat_err(net_dev,
103 "Download speed of gateway mode invalid: %s\n", 103 "Download speed of gateway mode invalid: %s\n",
@@ -122,7 +122,7 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff,
122 *tmp_ptr = '\0'; 122 *tmp_ptr = '\0';
123 } 123 }
124 124
125 ret = strict_strtol(slash_ptr + 1, 10, &lup); 125 ret = kstrtol(slash_ptr + 1, 10, &lup);
126 if (ret) { 126 if (ret) {
127 bat_err(net_dev, 127 bat_err(net_dev,
128 "Upload speed of gateway mode invalid: " 128 "Upload speed of gateway mode invalid: "