projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[cascardo/linux.git]
/
fs
/
cifs
/
netmisc.c
diff --git
a/fs/cifs/netmisc.c
b/fs/cifs/netmisc.c
index
dd23a32
..
581c225
100644
(file)
--- a/
fs/cifs/netmisc.c
+++ b/
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;
}