From 2c87feaac298588debdbaf2e7a89e8d256cb4cfd Mon Sep 17 00:00:00 2001
From: Shuah Khan <shuahkhan@gmail.com>
Date: Thu, 12 Apr 2012 09:28:13 +0000
Subject: [PATCH] --- yaml --- r: 300607 b: refs/heads/master c:
 e1e420c71b53829c661123a21b14a42d821e5e7f h: refs/heads/master i:   300605:
 27eded1fbace8b46b85fb3b5e846ab26477333db   300603:
 4bdd9919e93152a64933fc9200cc4d11559095dc   300599:
 7b5e5d6349c7cbbcb53d733b7145b5d4d49174f6   300591:
 901e2b88e348412c1bc471ebd09d3b18ed6b3e69   300575:
 04ee774cc2c80f1d5a6baeb296f848aa2802c7b5   300543:
 2e7f62b682397611694dc1fc0d112507aec8be2f v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/net-sysfs.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3b8eaaad37af..49a21d03db75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1caf09df78a1b40604f200f419b08819e139b858
+refs/heads/master: e1e420c71b53829c661123a21b14a42d821e5e7f
diff --git a/trunk/net/core/net-sysfs.c b/trunk/net/core/net-sysfs.c
index 495586232aa1..97d0f2453a0e 100644
--- a/trunk/net/core/net-sysfs.c
+++ b/trunk/net/core/net-sysfs.c
@@ -74,15 +74,14 @@ static ssize_t netdev_store(struct device *dev, struct device_attribute *attr,
 			    int (*set)(struct net_device *, unsigned long))
 {
 	struct net_device *net = to_net_dev(dev);
-	char *endp;
 	unsigned long new;
 	int ret = -EINVAL;
 
 	if (!capable(CAP_NET_ADMIN))
 		return -EPERM;
 
-	new = simple_strtoul(buf, &endp, 0);
-	if (endp == buf)
+	ret = kstrtoul(buf, 0, &new);
+	if (ret)
 		goto err;
 
 	if (!rtnl_trylock())