diff options
Diffstat (limited to 'net/atm/pvc.c')
| -rw-r--r-- | net/atm/pvc.c | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/net/atm/pvc.c b/net/atm/pvc.c index 8d74e62b0d79..437ee70c5e62 100644 --- a/net/atm/pvc.c +++ b/net/atm/pvc.c | |||
| @@ -17,32 +17,35 @@ | |||
| 17 | #include "common.h" /* common for PVCs and SVCs */ | 17 | #include "common.h" /* common for PVCs and SVCs */ |
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | static int pvc_shutdown(struct socket *sock,int how) | 20 | static int pvc_shutdown(struct socket *sock, int how) |
| 21 | { | 21 | { |
| 22 | return 0; | 22 | return 0; |
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | 25 | static int pvc_bind(struct socket *sock, struct sockaddr *sockaddr, | |
| 26 | static int pvc_bind(struct socket *sock,struct sockaddr *sockaddr, | 26 | int sockaddr_len) |
| 27 | int sockaddr_len) | ||
| 28 | { | 27 | { |
| 29 | struct sock *sk = sock->sk; | 28 | struct sock *sk = sock->sk; |
| 30 | struct sockaddr_atmpvc *addr; | 29 | struct sockaddr_atmpvc *addr; |
| 31 | struct atm_vcc *vcc; | 30 | struct atm_vcc *vcc; |
| 32 | int error; | 31 | int error; |
| 33 | 32 | ||
| 34 | if (sockaddr_len != sizeof(struct sockaddr_atmpvc)) return -EINVAL; | 33 | if (sockaddr_len != sizeof(struct sockaddr_atmpvc)) |
| 35 | addr = (struct sockaddr_atmpvc *) sockaddr; | 34 | return -EINVAL; |
| 36 | if (addr->sap_family != AF_ATMPVC) return -EAFNOSUPPORT; | 35 | addr = (struct sockaddr_atmpvc *)sockaddr; |
| 36 | if (addr->sap_family != AF_ATMPVC) | ||
| 37 | return -EAFNOSUPPORT; | ||
| 37 | lock_sock(sk); | 38 | lock_sock(sk); |
| 38 | vcc = ATM_SD(sock); | 39 | vcc = ATM_SD(sock); |
| 39 | if (!test_bit(ATM_VF_HASQOS, &vcc->flags)) { | 40 | if (!test_bit(ATM_VF_HASQOS, &vcc->flags)) { |
| 40 | error = -EBADFD; | 41 | error = -EBADFD; |
| 41 | goto out; | 42 | goto out; |
| 42 | } | 43 | } |
| 43 | if (test_bit(ATM_VF_PARTIAL,&vcc->flags)) { | 44 | if (test_bit(ATM_VF_PARTIAL, &vcc->flags)) { |
| 44 | if (vcc->vpi != ATM_VPI_UNSPEC) addr->sap_addr.vpi = vcc->vpi; | 45 | if (vcc->vpi != ATM_VPI_UNSPEC) |
| 45 | if (vcc->vci != ATM_VCI_UNSPEC) addr->sap_addr.vci = vcc->vci; | 46 | addr->sap_addr.vpi = vcc->vpi; |
| 47 | if (vcc->vci != ATM_VCI_UNSPEC) | ||
| 48 | addr->sap_addr.vci = vcc->vci; | ||
| 46 | } | 49 | } |
| 47 | error = vcc_connect(sock, addr->sap_addr.itf, addr->sap_addr.vpi, | 50 | error = vcc_connect(sock, addr->sap_addr.itf, addr->sap_addr.vpi, |
| 48 | addr->sap_addr.vci); | 51 | addr->sap_addr.vci); |
| @@ -51,11 +54,10 @@ out: | |||
| 51 | return error; | 54 | return error; |
| 52 | } | 55 | } |
| 53 | 56 | ||
| 54 | 57 | static int pvc_connect(struct socket *sock, struct sockaddr *sockaddr, | |
| 55 | static int pvc_connect(struct socket *sock,struct sockaddr *sockaddr, | 58 | int sockaddr_len, int flags) |
| 56 | int sockaddr_len,int flags) | ||
| 57 | { | 59 | { |
| 58 | return pvc_bind(sock,sockaddr,sockaddr_len); | 60 | return pvc_bind(sock, sockaddr, sockaddr_len); |
| 59 | } | 61 | } |
| 60 | 62 | ||
| 61 | static int pvc_setsockopt(struct socket *sock, int level, int optname, | 63 | static int pvc_setsockopt(struct socket *sock, int level, int optname, |
| @@ -70,7 +72,6 @@ static int pvc_setsockopt(struct socket *sock, int level, int optname, | |||
| 70 | return error; | 72 | return error; |
| 71 | } | 73 | } |
| 72 | 74 | ||
| 73 | |||
| 74 | static int pvc_getsockopt(struct socket *sock, int level, int optname, | 75 | static int pvc_getsockopt(struct socket *sock, int level, int optname, |
| 75 | char __user *optval, int __user *optlen) | 76 | char __user *optval, int __user *optlen) |
| 76 | { | 77 | { |
| @@ -83,16 +84,16 @@ static int pvc_getsockopt(struct socket *sock, int level, int optname, | |||
| 83 | return error; | 84 | return error; |
| 84 | } | 85 | } |
| 85 | 86 | ||
| 86 | 87 | static int pvc_getname(struct socket *sock, struct sockaddr *sockaddr, | |
| 87 | static int pvc_getname(struct socket *sock,struct sockaddr *sockaddr, | 88 | int *sockaddr_len, int peer) |
| 88 | int *sockaddr_len,int peer) | ||
| 89 | { | 89 | { |
| 90 | struct sockaddr_atmpvc *addr; | 90 | struct sockaddr_atmpvc *addr; |
| 91 | struct atm_vcc *vcc = ATM_SD(sock); | 91 | struct atm_vcc *vcc = ATM_SD(sock); |
| 92 | 92 | ||
| 93 | if (!vcc->dev || !test_bit(ATM_VF_ADDR,&vcc->flags)) return -ENOTCONN; | 93 | if (!vcc->dev || !test_bit(ATM_VF_ADDR, &vcc->flags)) |
| 94 | return -ENOTCONN; | ||
| 94 | *sockaddr_len = sizeof(struct sockaddr_atmpvc); | 95 | *sockaddr_len = sizeof(struct sockaddr_atmpvc); |
| 95 | addr = (struct sockaddr_atmpvc *) sockaddr; | 96 | addr = (struct sockaddr_atmpvc *)sockaddr; |
| 96 | addr->sap_family = AF_ATMPVC; | 97 | addr->sap_family = AF_ATMPVC; |
| 97 | addr->sap_addr.itf = vcc->dev->number; | 98 | addr->sap_addr.itf = vcc->dev->number; |
| 98 | addr->sap_addr.vpi = vcc->vpi; | 99 | addr->sap_addr.vpi = vcc->vpi; |
| @@ -100,7 +101,6 @@ static int pvc_getname(struct socket *sock,struct sockaddr *sockaddr, | |||
| 100 | return 0; | 101 | return 0; |
| 101 | } | 102 | } |
| 102 | 103 | ||
| 103 | |||
| 104 | static const struct proto_ops pvc_proto_ops = { | 104 | static const struct proto_ops pvc_proto_ops = { |
| 105 | .family = PF_ATMPVC, | 105 | .family = PF_ATMPVC, |
| 106 | .owner = THIS_MODULE, | 106 | .owner = THIS_MODULE, |
| @@ -137,7 +137,6 @@ static int pvc_create(struct net *net, struct socket *sock, int protocol, | |||
| 137 | return vcc_create(net, sock, protocol, PF_ATMPVC); | 137 | return vcc_create(net, sock, protocol, PF_ATMPVC); |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | |||
| 141 | static const struct net_proto_family pvc_family_ops = { | 140 | static const struct net_proto_family pvc_family_ops = { |
| 142 | .family = PF_ATMPVC, | 141 | .family = PF_ATMPVC, |
| 143 | .create = pvc_create, | 142 | .create = pvc_create, |
