git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[pandora-kernel.git]
/
net
/
atm
/
svc.c
diff --git
a/net/atm/svc.c
b/net/atm/svc.c
index
daf9a48
..
de1e4f2
100644
(file)
--- a/
net/atm/svc.c
+++ b/
net/atm/svc.c
@@
-326,7
+326,7
@@
static int svc_accept(struct socket *sock,struct socket *newsock,int flags)
lock_sock(sk);
- error = svc_create(s
k->sk_net
, newsock,0);
+ error = svc_create(s
ock_net(sk)
, newsock,0);
if (error)
goto out;