projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6-block.git]
/
net
/
can
/
af_can.c
diff --git
a/net/can/af_can.c
b/net/can/af_can.c
index 689c818ed00770e8661ffdf69c3675ce7c11b46a..7933e62a7318915327c7f0a9a8ead8beada40a2e 100644
(file)
--- a/
net/can/af_can.c
+++ b/
net/can/af_can.c
@@
-179,7
+179,7
@@
static int can_create(struct net *net, struct socket *sock, int protocol,
sock->ops = cp->ops;
- sk = sk_alloc(net, PF_CAN, GFP_KERNEL, cp->prot);
+ sk = sk_alloc(net, PF_CAN, GFP_KERNEL, cp->prot
, kern
);
if (!sk) {
err = -ENOMEM;
goto errout;