diff options
Diffstat (limited to 'net/irda/af_irda.c')
-rw-r--r-- | net/irda/af_irda.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index 568edc72d737..ee0ea25c8e7a 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c | |||
@@ -1256,14 +1256,13 @@ static int irda_release(struct socket *sock) | |||
1256 | } | 1256 | } |
1257 | 1257 | ||
1258 | /* | 1258 | /* |
1259 | * Function irda_sendmsg (iocb, sock, msg, len) | 1259 | * Function irda_sendmsg (sock, msg, len) |
1260 | * | 1260 | * |
1261 | * Send message down to TinyTP. This function is used for both STREAM and | 1261 | * Send message down to TinyTP. This function is used for both STREAM and |
1262 | * SEQPACK services. This is possible since it forces the client to | 1262 | * SEQPACK services. This is possible since it forces the client to |
1263 | * fragment the message if necessary | 1263 | * fragment the message if necessary |
1264 | */ | 1264 | */ |
1265 | static int irda_sendmsg(struct kiocb *iocb, struct socket *sock, | 1265 | static int irda_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) |
1266 | struct msghdr *msg, size_t len) | ||
1267 | { | 1266 | { |
1268 | struct sock *sk = sock->sk; | 1267 | struct sock *sk = sock->sk; |
1269 | struct irda_sock *self; | 1268 | struct irda_sock *self; |
@@ -1348,13 +1347,13 @@ out: | |||
1348 | } | 1347 | } |
1349 | 1348 | ||
1350 | /* | 1349 | /* |
1351 | * Function irda_recvmsg_dgram (iocb, sock, msg, size, flags) | 1350 | * Function irda_recvmsg_dgram (sock, msg, size, flags) |
1352 | * | 1351 | * |
1353 | * Try to receive message and copy it to user. The frame is discarded | 1352 | * Try to receive message and copy it to user. The frame is discarded |
1354 | * after being read, regardless of how much the user actually read | 1353 | * after being read, regardless of how much the user actually read |
1355 | */ | 1354 | */ |
1356 | static int irda_recvmsg_dgram(struct kiocb *iocb, struct socket *sock, | 1355 | static int irda_recvmsg_dgram(struct socket *sock, struct msghdr *msg, |
1357 | struct msghdr *msg, size_t size, int flags) | 1356 | size_t size, int flags) |
1358 | { | 1357 | { |
1359 | struct sock *sk = sock->sk; | 1358 | struct sock *sk = sock->sk; |
1360 | struct irda_sock *self = irda_sk(sk); | 1359 | struct irda_sock *self = irda_sk(sk); |
@@ -1398,10 +1397,10 @@ static int irda_recvmsg_dgram(struct kiocb *iocb, struct socket *sock, | |||
1398 | } | 1397 | } |
1399 | 1398 | ||
1400 | /* | 1399 | /* |
1401 | * Function irda_recvmsg_stream (iocb, sock, msg, size, flags) | 1400 | * Function irda_recvmsg_stream (sock, msg, size, flags) |
1402 | */ | 1401 | */ |
1403 | static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock, | 1402 | static int irda_recvmsg_stream(struct socket *sock, struct msghdr *msg, |
1404 | struct msghdr *msg, size_t size, int flags) | 1403 | size_t size, int flags) |
1405 | { | 1404 | { |
1406 | struct sock *sk = sock->sk; | 1405 | struct sock *sk = sock->sk; |
1407 | struct irda_sock *self = irda_sk(sk); | 1406 | struct irda_sock *self = irda_sk(sk); |
@@ -1515,14 +1514,14 @@ static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock, | |||
1515 | } | 1514 | } |
1516 | 1515 | ||
1517 | /* | 1516 | /* |
1518 | * Function irda_sendmsg_dgram (iocb, sock, msg, len) | 1517 | * Function irda_sendmsg_dgram (sock, msg, len) |
1519 | * | 1518 | * |
1520 | * Send message down to TinyTP for the unreliable sequenced | 1519 | * Send message down to TinyTP for the unreliable sequenced |
1521 | * packet service... | 1520 | * packet service... |
1522 | * | 1521 | * |
1523 | */ | 1522 | */ |
1524 | static int irda_sendmsg_dgram(struct kiocb *iocb, struct socket *sock, | 1523 | static int irda_sendmsg_dgram(struct socket *sock, struct msghdr *msg, |
1525 | struct msghdr *msg, size_t len) | 1524 | size_t len) |
1526 | { | 1525 | { |
1527 | struct sock *sk = sock->sk; | 1526 | struct sock *sk = sock->sk; |
1528 | struct irda_sock *self; | 1527 | struct irda_sock *self; |
@@ -1594,14 +1593,14 @@ out: | |||
1594 | } | 1593 | } |
1595 | 1594 | ||
1596 | /* | 1595 | /* |
1597 | * Function irda_sendmsg_ultra (iocb, sock, msg, len) | 1596 | * Function irda_sendmsg_ultra (sock, msg, len) |
1598 | * | 1597 | * |
1599 | * Send message down to IrLMP for the unreliable Ultra | 1598 | * Send message down to IrLMP for the unreliable Ultra |
1600 | * packet service... | 1599 | * packet service... |
1601 | */ | 1600 | */ |
1602 | #ifdef CONFIG_IRDA_ULTRA | 1601 | #ifdef CONFIG_IRDA_ULTRA |
1603 | static int irda_sendmsg_ultra(struct kiocb *iocb, struct socket *sock, | 1602 | static int irda_sendmsg_ultra(struct socket *sock, struct msghdr *msg, |
1604 | struct msghdr *msg, size_t len) | 1603 | size_t len) |
1605 | { | 1604 | { |
1606 | struct sock *sk = sock->sk; | 1605 | struct sock *sk = sock->sk; |
1607 | struct irda_sock *self; | 1606 | struct irda_sock *self; |