projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' into for-linus
[linux-2.6-microblaze.git]
/
net
/
nfc
/
rawsock.c
diff --git
a/net/nfc/rawsock.c
b/net/nfc/rawsock.c
index
9c7eb84
..
5f1d438
100644
(file)
--- a/
net/nfc/rawsock.c
+++ b/
net/nfc/rawsock.c
@@
-329,7
+329,7
@@
static int rawsock_create(struct net *net, struct socket *sock,
return -ESOCKTNOSUPPORT;
if (sock->type == SOCK_RAW) {
- if (!
capable(
CAP_NET_RAW))
+ if (!
ns_capable(net->user_ns,
CAP_NET_RAW))
return -EPERM;
sock->ops = &rawsock_raw_ops;
} else {