Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap...

[~andy/linux] / net / atm / svc.c

diff --git a/net/atm/svc.c b/net/atm/svc.c
index daf9a48a7db04454392fda10fd1f8c142f27b930..de1e4f2f3a43ea983f9a4eef973618772b69cc82 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(sk->sk_net, newsock,0);
+       error = svc_create(sock_net(sk), newsock,0);
        if (error)
                goto out;