diff options
Diffstat (limited to 'net/atm/svc.c')
-rw-r--r-- | net/atm/svc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/atm/svc.c b/net/atm/svc.c index f90d143c4b25..66e1d9b3e5de 100644 --- a/net/atm/svc.c +++ b/net/atm/svc.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "signaling.h" | 25 | #include "signaling.h" |
26 | #include "addr.h" | 26 | #include "addr.h" |
27 | 27 | ||
28 | static int svc_create(struct net *net, struct socket *sock,int protocol); | 28 | static int svc_create(struct net *net, struct socket *sock, int protocol, int kern); |
29 | 29 | ||
30 | /* | 30 | /* |
31 | * Note: since all this is still nicely synchronized with the signaling demon, | 31 | * Note: since all this is still nicely synchronized with the signaling demon, |
@@ -330,7 +330,7 @@ static int svc_accept(struct socket *sock,struct socket *newsock,int flags) | |||
330 | 330 | ||
331 | lock_sock(sk); | 331 | lock_sock(sk); |
332 | 332 | ||
333 | error = svc_create(sock_net(sk), newsock,0); | 333 | error = svc_create(sock_net(sk), newsock, 0, 0); |
334 | if (error) | 334 | if (error) |
335 | goto out; | 335 | goto out; |
336 | 336 | ||
@@ -650,11 +650,12 @@ static const struct proto_ops svc_proto_ops = { | |||
650 | }; | 650 | }; |
651 | 651 | ||
652 | 652 | ||
653 | static int svc_create(struct net *net, struct socket *sock,int protocol) | 653 | static int svc_create(struct net *net, struct socket *sock, int protocol, |
654 | int kern) | ||
654 | { | 655 | { |
655 | int error; | 656 | int error; |
656 | 657 | ||
657 | if (net != &init_net) | 658 | if (!net_eq(net, &init_net)) |
658 | return -EAFNOSUPPORT; | 659 | return -EAFNOSUPPORT; |
659 | 660 | ||
660 | sock->ops = &svc_proto_ops; | 661 | sock->ops = &svc_proto_ops; |
@@ -666,7 +667,7 @@ static int svc_create(struct net *net, struct socket *sock,int protocol) | |||
666 | } | 667 | } |
667 | 668 | ||
668 | 669 | ||
669 | static struct net_proto_family svc_family_ops = { | 670 | static const struct net_proto_family svc_family_ops = { |
670 | .family = PF_ATMSVC, | 671 | .family = PF_ATMSVC, |
671 | .create = svc_create, | 672 | .create = svc_create, |
672 | .owner = THIS_MODULE, | 673 | .owner = THIS_MODULE, |