[linux-next] LinuxNextTracking branch, master, updated. next-20110624

batman at open-mesh.org batman at open-mesh.org
Fri Jun 24 16:09:47 CEST 2011


The following commit has been merged in the master branch:
commit e72948eb21d1da0275be1c6e0c7a9a22aa67a5e3
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Jun 4 14:00:49 2011 +0200

    batman-adv: Fix signedness problem in parse_gw_bandwidth
    
    strict_strtoul as used in parse_gw_bandwidth is defined for unsigned
    long and strict_strtol should be used instead for long.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c
index ed3bd36..e74307b 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_strtoul(buff, 10, &ldown);
+	ret = strict_strtol(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_strtoul(slash_ptr + 1, 10, &lup);
+		ret = strict_strtol(slash_ptr + 1, 10, &lup);
 		if (ret) {
 			bat_err(net_dev,
 				"Upload speed of gateway mode invalid: "

-- 
LinuxNextTracking


More information about the linux-merge mailing list