isdn: Use kernel_{send,recv}msg instead of open coding
Subsystems (2)
PATCH 1/1 isdn: Use kernel_{send,recv}msg instead of open coding
Reducing the number of direct users of sock_{recv,send}msg.
drivers/isdn/mISDN/l1oip_core.c +2 -10
@@ -279,7 +279,6 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask,int multi =0 ;u8 frame[len+32 ];struct socket *socket =NULL ; -mm_segment_t oldfs;if (debug &DEBUG_L1OIP_MSG ) printk(KERN_DEBUG "%s: sending data to socket (len = %d)\n",
@@ -352,10 +351,7 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask, "= %d)\n", __func__, len); hc->sendiov.iov_base = frame; hc->sendiov.iov_len = len; - oldfs =get_fs (); -set_fs (KERNEL_DS ); - len =sock_sendmsg (socket, &hc->sendmsg, len); -set_fs (oldfs); + len =kernel_sendmsg (socket, &hc->sendmsg, len);/* give socket back */ hc->socket = socket;/* no locking required */
@@ -661,7 +657,6 @@ l1oip_socket_thread(void *data)int ret =0 ;struct msghdr msg;struct iovec iov; -mm_segment_t oldfs;struct sockaddr_in sin_rx;unsigned char recvbuf[1500 ];int recvlen;
@@ -731,10 +726,7 @@ l1oip_socket_thread(void *data)while (!signal_pending (current)) { iov.iov_base = recvbuf; iov.iov_len =sizeof (recvbuf); - oldfs =get_fs (); -set_fs (KERNEL_DS ); - recvlen =sock_recvmsg (socket, &msg,sizeof (recvbuf),0 ); -set_fs (oldfs); + recvlen =kernel_recvmsg (socket, &msg,sizeof (recvbuf),0 );if (recvlen >0 ) {l1oip_socket_parse (hc, &sin_rx, recvbuf, recvlen); }else {
David Miller
maintainerFrom: Arnaldo Carvalho de Melo <[email protected]>
Date: Thu, 21 May 2009 12:41:26 -0300
Quoted 3 lines
Reducing the number of direct users of sock_{recv,send}msg.
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
Nice work, applied, thanks!
David Miller
maintainerFrom: David Miller <[email protected]>
Date: Thu, 21 May 2009 15:14:43 -0700 (PDT)
Quoted 8 lines
From: Arnaldo Carvalho de Melo <[email protected]>
Date: Thu, 21 May 2009 12:41:26 -0300Quoted 3 lines
Reducing the number of direct users of sock_{recv,send}msg.
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>Nice work, applied, thanks!
Nevermind, I'm reverting, this doesn't even build:
drivers/isdn/mISDN/l1oip_core.c: In function 'l1oip_socket_send':drivers/isdn/mISDN/l1oip_core.c:354: warning: passing argument 3 of 'kernel_sendmsg' makes pointer from integer without a cast drivers/isdn/mISDN/l1oip_core.c:354: error: too few arguments to function 'kernel_sendmsg' drivers/isdn/mISDN/l1oip_core.c: In function 'l1oip_socket_thread':drivers/isdn/mISDN/l1oip_core.c:729: warning: passing argument 3 of 'kernel_recvmsg' makes pointer from integer without a cast drivers/isdn/mISDN/l1oip_core.c:729: error: too few arguments to function 'kernel_recvmsg'
Em Thu, May 21, 2009 at 04:49:29PM -0700, David Miller escreveu:
Quoted 12 lines
From: David Miller <[email protected]>
Date: Thu, 21 May 2009 15:14:43 -0700 (PDT)Quoted 8 lines
From: Arnaldo Carvalho de Melo <[email protected]>
Date: Thu, 21 May 2009 12:41:26 -0300Quoted 3 lines
Reducing the number of direct users of sock_{recv,send}msg.
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>Nice work, applied, thanks!
Quoted 8 lines
Nevermind, I'm reverting, this doesn't even build:
drivers/isdn/mISDN/l1oip_core.c: In function 'l1oip_socket_send':drivers/isdn/mISDN/l1oip_core.c:354: warning: passing argument 3 of 'kernel_sendmsg' makes pointer from integer without a castdrivers/isdn/mISDN/l1oip_core.c:354: error: too few arguments to function 'kernel_sendmsg'drivers/isdn/mISDN/l1oip_core.c: In function 'l1oip_socket_thread':drivers/isdn/mISDN/l1oip_core.c:729: warning: passing argument 3 of 'kernel_recvmsg' makes pointer from integer without a castdrivers/isdn/mISDN/l1oip_core.c:729: error: too few arguments to function 'kernel_recvmsg'
I should have said "not even compile tested".
Will understand stricter questioning in the future.
Damn, these are not present in at least the distro kernel build I tried...
- Arnaldo