summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/gateway_common.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-11-26 14:26:24 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-26 14:26:24 -0500
commitd6f03f29f7cdf064289f941bf0b838348e996e65 (patch)
treef8e75089e5690d27c271ca382f25a3386db76f14 /net/batman-adv/gateway_common.c
parent6f39da2c5eab64921f92a9ff4a48f3d14a8db24c (diff)
parent76e8d7b0d1b0091929e8cd18551a87b6bb6ef2c1 (diff)
Merge branch 'for_david' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/batman-adv/gateway_common.c')
-rw-r--r--net/batman-adv/gateway_common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c
index 18661af0bc3..c4ac7b0a2a6 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,
*tmp_ptr = '\0';
}
- ret = strict_strtol(buff, 10, &ldown);
+ ret = kstrtol(buff, 10, &ldown);
if (ret) {
bat_err(net_dev,
"Download speed of gateway mode invalid: %s\n",
@@ -122,7 +122,7 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff,
*tmp_ptr = '\0';
}
- ret = strict_strtol(slash_ptr + 1, 10, &lup);
+ ret = kstrtol(slash_ptr + 1, 10, &lup);
if (ret) {
bat_err(net_dev,
"Upload speed of gateway mode invalid: "