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
DSS2: Small VRFB context allocation bug fixed
[pandora-kernel.git]
/
net
/
atm
/
pvc.c
diff --git
a/net/atm/pvc.c
b/net/atm/pvc.c
index
b2148b4
..
43e8bf5
100644
(file)
--- a/
net/atm/pvc.c
+++ b/
net/atm/pvc.c
@@
-72,7
+72,7
@@
static int pvc_setsockopt(struct socket *sock, int level, int optname,
static int pvc_getsockopt(struct socket *sock, int level, int optname,
static int pvc_getsockopt(struct socket *sock, int level, int optname,
- char __user *optval, int __user *optlen)
+ char __user *optval, int __user *optlen)
{
struct sock *sk = sock->sk;
int error;
{
struct sock *sk = sock->sk;
int error;
@@
-91,7
+91,7
@@
static int pvc_getname(struct socket *sock,struct sockaddr *sockaddr,
struct atm_vcc *vcc = ATM_SD(sock);
if (!vcc->dev || !test_bit(ATM_VF_ADDR,&vcc->flags)) return -ENOTCONN;
struct atm_vcc *vcc = ATM_SD(sock);
if (!vcc->dev || !test_bit(ATM_VF_ADDR,&vcc->flags)) return -ENOTCONN;
-
*sockaddr_len = sizeof(struct sockaddr_atmpvc);
+ *sockaddr_len = sizeof(struct sockaddr_atmpvc);
addr = (struct sockaddr_atmpvc *) sockaddr;
addr->sap_family = AF_ATMPVC;
addr->sap_addr.itf = vcc->dev->number;
addr = (struct sockaddr_atmpvc *) sockaddr;
addr->sap_family = AF_ATMPVC;
addr->sap_addr.itf = vcc->dev->number;
@@
-124,10
+124,13
@@
static const struct proto_ops pvc_proto_ops = {
};
};
-static int pvc_create(struct socket *sock,int protocol)
+static int pvc_create(struct
net *net, struct
socket *sock,int protocol)
{
{
+ if (net != &init_net)
+ return -EAFNOSUPPORT;
+
sock->ops = &pvc_proto_ops;
sock->ops = &pvc_proto_ops;
- return vcc_create(sock, protocol, PF_ATMPVC);
+ return vcc_create(
net,
sock, protocol, PF_ATMPVC);
}
}