Skip to contentSkip to conversation

(12/17) irda -- size_t for send/recvmsg

PATCH In review Stephen Hemminger 3 participants 4 messages Jan 8, 2004 – Jan 9, 2004

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore
#2 lore raw
Quoted 5 lines · On Thu, 8 Jan 2004 14:56:57 -0800 Jean Tourrilhes <[email protected]> wrote:
Quoted 1 line · Stephen Hemminger

Convert IRDA to unsigned length for send/recv msg.

Ok, I've added that on my web page and will remind Dave if he
doesn't pick it up.

Don't worry, I'll queue all of these up for 2.6.2, it's too late for 2.6.1 at this point.

#3 lore raw
Quoted 11 lines · David S. Miller
Quoted 5 lines · On Thu, 8 Jan 2004 14:56:57 -0800 Jean Tourrilhes <[email protected]> wrote:
Quoted 1 line · Stephen Hemminger

Convert IRDA to unsigned length for send/recv msg.

Ok, I've added that on my web page and will remind Dave if he
doesn't pick it up.

Don't worry, I'll queue all of these up for 2.6.2, it's too late for 2.6.1 at this point.

Perfect. 2.6.2 is what I was aiming for, it's not like we are
in a hurry.
Thanks a lot !

Jean

Stephen Hemminger

author
#0 lore raw

PATCH 1/1 (12/17) irda -- size_t for send/recvmsg

Convert IRDA to unsigned length for send/recv msg.

net/irda/af_irda.c +8 -7
diff -Nru a/net/irda/af_irda.c b/net/irda/af_irda.c
@@ -1257,7 +1257,7 @@
  *    fragment the message if necessary
  */
 static int irda_sendmsg(struct kiocb *iocb, struct socket *sock,
-			struct msghdr *msg, int len)
+			struct msghdr *msg, size_t len)
 {
 	struct sock *sk = sock->sk;
 	struct irda_sock *self;

@@ -1329,12 +1329,13 @@
  *    after being read, regardless of how much the user actually read
  */
 static int irda_recvmsg_dgram(struct kiocb *iocb, struct socket *sock,
-			      struct msghdr *msg, int size, int flags)
+			      struct msghdr *msg, size_t size, int flags)
 {
 	struct sock *sk = sock->sk;
 	struct irda_sock *self = irda_sk(sk);
 	struct sk_buff *skb;
-	int copied, err;
+	size_t copied;
+	int err;
 
 	IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
 

@@ -1379,12 +1380,12 @@
  * Function irda_recvmsg_stream (iocb, sock, msg, size, flags)
  */
 static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock,
-			       struct msghdr *msg, int size, int flags)
+			       struct msghdr *msg, size_t size, int flags)
 {
 	struct sock *sk = sock->sk;
 	struct irda_sock *self = irda_sk(sk);
 	int noblock = flags & MSG_DONTWAIT;
-	int copied = 0;
+	size_t copied = 0;
 	int target = 1;
 	DECLARE_WAITQUEUE(waitq, current);
 

@@ -1505,7 +1506,7 @@
  *
  */
 static int irda_sendmsg_dgram(struct kiocb *iocb, struct socket *sock,
-			      struct msghdr *msg, int len)
+			      struct msghdr *msg, size_t len)
 {
 	struct sock *sk = sock->sk;
 	struct irda_sock *self;

@@ -1571,7 +1572,7 @@
  */
 #ifdef CONFIG_IRDA_ULTRA
 static int irda_sendmsg_ultra(struct kiocb *iocb, struct socket *sock,
-			      struct msghdr *msg, int len)
+			      struct msghdr *msg, size_t len)
 {
 	struct sock *sk = sock->sk;
 	struct irda_sock *self;