redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

mISDN: Use kernel_{send,recv}msg instead of open coding 

Reducing the number of direct users of sock_{recv,send}msg.
Modified version to match the latest context.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Arnaldo Carvalho de Melo 2009-05-22 11:04:57 +00:00 committed by David S. Miller
parent eac74af9b5
commit 8c90e11e35
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/isdn/mISDN/l1oip.h
View File

@ -76,7 +76,7 @@ struct l1oip {
struct sockaddr_in sin_local; /* local socket name */
struct sockaddr_in sin_remote; /* remote socket name */
struct msghdr sendmsg; /* ip message to send */
struct iovec sendiov; /* iov for message */
struct kvec sendiov; /* iov for message */
/* frame */
struct l1oip_chan chan[128]; /* channel instances */

24
drivers/isdn/mISDN/l1oip_core.c
View File

@ -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, &hc->sendiov, 1, len);
/* give socket back */
hc->socket = socket; /* no locking required */
@ -660,8 +656,6 @@ l1oip_socket_thread(void *data)
struct l1oip *hc = (struct l1oip *)data;
int ret = 0;
struct msghdr msg;
struct iovec iov;
mm_segment_t oldfs;
struct sockaddr_in sin_rx;
unsigned char *recvbuf;
size_t recvbuf_size = 1500;
@ -718,16 +712,12 @@ l1oip_socket_thread(void *data)
msg.msg_namelen = sizeof(sin_rx);
msg.msg_control = NULL;
msg.msg_controllen = 0;
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
/* build send message */
hc->sendmsg.msg_name = &hc->sin_remote;
hc->sendmsg.msg_namelen = sizeof(hc->sin_remote);
hc->sendmsg.msg_control = NULL;
hc->sendmsg.msg_controllen = 0;
hc->sendmsg.msg_iov = &hc->sendiov;
hc->sendmsg.msg_iovlen = 1;
/* give away socket */
spin_lock(&hc->socket_lock);
@ -739,12 +729,12 @@ l1oip_socket_thread(void *data)
printk(KERN_DEBUG "%s: socket created and open\n",
__func__);
while (!signal_pending(current)) {
iov.iov_base = recvbuf;
iov.iov_len = recvbuf_size;
oldfs = get_fs();
set_fs(KERNEL_DS);
recvlen = sock_recvmsg(socket, &msg, recvbuf_size, 0);
set_fs(oldfs);
struct kvec iov = {
.iov_base = recvbuf,
.iov_len = sizeof(recvbuf),
};
recvlen = kernel_recvmsg(socket, &msg, &iov, 1,
sizeof(recvbuf), 0);
if (recvlen > 0) {
l1oip_socket_parse(hc, &sin_rx, recvbuf, recvlen);
} else {