From 05fb050ec05c6d91fd4013c37e52de111a99b31d Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 1 Mar 2012 10:06:52 +0300
Subject: [PATCH] --- yaml --- r: 298638 b: refs/heads/master c:
 2545e0720a5a4bf8ebccc6f793f97a246cf3f18d h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/netmisc.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 58b9a2b2a05c..c6f83ff46f2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2a3ad9ca502169fc4c11296fa20f56059c7c031
+refs/heads/master: 2545e0720a5a4bf8ebccc6f793f97a246cf3f18d
diff --git a/trunk/fs/cifs/netmisc.c b/trunk/fs/cifs/netmisc.c
index dd23a321bdda..581c225f7f50 100644
--- a/trunk/fs/cifs/netmisc.c
+++ b/trunk/fs/cifs/netmisc.c
@@ -197,8 +197,7 @@ cifs_convert_address(struct sockaddr *dst, const char *src, int len)
 		memcpy(scope_id, pct + 1, slen);
 		scope_id[slen] = '\0';
 
-		rc = strict_strtoul(scope_id, 0,
-					(unsigned long *)&s6->sin6_scope_id);
+		rc = kstrtouint(scope_id, 0, &s6->sin6_scope_id);
 		rc = (rc == 0) ? 1 : 0;
 	}