aboutsummaryrefslogtreecommitdiffstats
path: root/net/atm
diff options
context:
space:
mode:
Diffstat (limited to 'net/atm')
-rw-r--r--net/atm/common.c7
-rw-r--r--net/atm/common.h7
2 files changed, 6 insertions, 8 deletions
diff --git a/net/atm/common.c b/net/atm/common.c
index b84057e41bd6..ed0466637e13 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -523,8 +523,8 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci)
523 return 0; 523 return 0;
524} 524}
525 525
526int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, 526int vcc_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
527 size_t size, int flags) 527 int flags)
528{ 528{
529 struct sock *sk = sock->sk; 529 struct sock *sk = sock->sk;
530 struct atm_vcc *vcc; 530 struct atm_vcc *vcc;
@@ -569,8 +569,7 @@ int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
569 return copied; 569 return copied;
570} 570}
571 571
572int vcc_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m, 572int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t size)
573 size_t size)
574{ 573{
575 struct sock *sk = sock->sk; 574 struct sock *sk = sock->sk;
576 DEFINE_WAIT(wait); 575 DEFINE_WAIT(wait);
diff --git a/net/atm/common.h b/net/atm/common.h
index cc3c2dae4d79..4d6f5b2068ac 100644
--- a/net/atm/common.h
+++ b/net/atm/common.h
@@ -13,10 +13,9 @@
13int vcc_create(struct net *net, struct socket *sock, int protocol, int family); 13int vcc_create(struct net *net, struct socket *sock, int protocol, int family);
14int vcc_release(struct socket *sock); 14int vcc_release(struct socket *sock);
15int vcc_connect(struct socket *sock, int itf, short vpi, int vci); 15int vcc_connect(struct socket *sock, int itf, short vpi, int vci);
16int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, 16int vcc_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
17 size_t size, int flags); 17 int flags);
18int vcc_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m, 18int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len);
19 size_t total_len);
20unsigned int vcc_poll(struct file *file, struct socket *sock, poll_table *wait); 19unsigned int vcc_poll(struct file *file, struct socket *sock, poll_table *wait);
21int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); 20int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
22int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); 21int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);