RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-02-26 01:20:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: compatibility to kernel 3.19

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2015-07-06 12:08:48 +02:00
parent 2ea01ece5f
commit 07887e1f74
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/mars_net.c
View File

@ -42,6 +42,17 @@
#include "mars_net.h" #include "mars_net.h"
#undef USE_SENDPAGE // FIXME: does not work, leads to data corruption (probably due to races with asynchrous sending) #undef USE_SENDPAGE // FIXME: does not work, leads to data corruption (probably due to races with asynchrous sending)
////////////////////////////////////////////////////////////////////
// provisionary version detection
#ifndef TCP_MAX_REORDERING
#define __HAS_IOV_ITER
#endif
////////////////////////////////////////////////////////////////////
#define USE_BUFFERING #define USE_BUFFERING
/* Low-level network traffic /* Low-level network traffic
@ -399,7 +410,9 @@ int _mars_send_raw(struct mars_socket *msock, const void *buf, int len)
.iov_len = this_len, .iov_len = this_len,
}; };
struct msghdr msg = { struct msghdr msg = {
#ifndef __HAS_IOV_ITER
.msg_iov = (struct iovec*)&iov, .msg_iov = (struct iovec*)&iov,
#endif
.msg_flags = 0 | MSG_NOSIGNAL, .msg_flags = 0 | MSG_NOSIGNAL,
}; };
status = kernel_sendmsg(sock, &msg, &iov, 1, this_len); status = kernel_sendmsg(sock, &msg, &iov, 1, this_len);
@ -568,8 +581,10 @@ int mars_recv_raw(struct mars_socket *msock, void *buf, int minlen, int maxlen)
.iov_len = maxlen - done, .iov_len = maxlen - done,
}; };
struct msghdr msg = { struct msghdr msg = {
#ifndef __HAS_IOV_ITER
.msg_iovlen = 1, .msg_iovlen = 1,
.msg_iov = (struct iovec*)&iov, .msg_iov = (struct iovec*)&iov,
#endif
.msg_flags = MSG_NOSIGNAL, .msg_flags = MSG_NOSIGNAL,
}; };
struct socket *sock = msock->s_socket; struct socket *sock = msock->s_socket;