You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
62 lines
3.2 KiB
62 lines
3.2 KiB
8 years ago
|
--- vsock-only/linux/af_vsock.c 2015-05-03 00:55:58.955156116 +0200
|
||
|
+++ vsock-only/linux/af_vsock.c.new 2015-05-03 01:01:14.305173750 +0200
|
||
|
@@ -233,14 +233,10 @@
|
||
|
static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname,
|
||
|
char __user *optval, int __user * optlen);
|
||
|
|
||
|
-static int VSockVmciDgramSendmsg(struct kiocb *kiocb,
|
||
|
- struct socket *sock, struct msghdr *msg, size_t len);
|
||
|
-static int VSockVmciDgramRecvmsg(struct kiocb *kiocb, struct socket *sock,
|
||
|
- struct msghdr *msg, size_t len, int flags);
|
||
|
-static int VSockVmciStreamSendmsg(struct kiocb *kiocb,
|
||
|
- struct socket *sock, struct msghdr *msg, size_t len);
|
||
|
-static int VSockVmciStreamRecvmsg(struct kiocb *kiocb, struct socket *sock,
|
||
|
- struct msghdr *msg, size_t len, int flags);
|
||
|
+static int VSockVmciDgramSendmsg(struct socket *sock, struct msghdr *msg, size_t len);
|
||
|
+static int VSockVmciDgramRecvmsg(struct socket *sock, struct msghdr *msg, size_t len, int flags);
|
||
|
+static int VSockVmciStreamSendmsg(struct socket *sock, struct msghdr *msg, size_t len);
|
||
|
+static int VSockVmciStreamRecvmsg(struct socket *sock, struct msghdr *msg, size_t len, int flags);
|
||
|
|
||
|
static int VSockVmciCreate(
|
||
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
|
||
|
@@ -4211,8 +4207,7 @@
|
||
|
*/
|
||
|
|
||
|
static int
|
||
|
-VSockVmciDgramSendmsg(struct kiocb *kiocb, // UNUSED
|
||
|
- struct socket *sock, // IN: socket to send on
|
||
|
+VSockVmciDgramSendmsg(struct socket *sock, // IN: socket to send on
|
||
|
struct msghdr *msg, // IN: message to send
|
||
|
size_t len) // IN: length of message
|
||
|
{
|
||
|
@@ -4541,8 +4536,7 @@
|
||
|
*/
|
||
|
|
||
|
static int
|
||
|
-VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED
|
||
|
- struct socket *sock, // IN: socket to send on
|
||
|
+VSockVmciStreamSendmsg(struct socket *sock, // IN: socket to send on
|
||
|
struct msghdr *msg, // IN: message to send
|
||
|
size_t len) // IN: length of message
|
||
|
{
|
||
|
@@ -4710,8 +4704,7 @@
|
||
|
*/
|
||
|
|
||
|
static int
|
||
|
-VSockVmciDgramRecvmsg(struct kiocb *kiocb, // UNUSED
|
||
|
- struct socket *sock, // IN: socket to receive from
|
||
|
+VSockVmciDgramRecvmsg(struct socket *sock, // IN: socket to receive from
|
||
|
struct msghdr *msg, // IN/OUT: message to receive into
|
||
|
size_t len, // IN: length of receive buffer
|
||
|
int flags) // IN: receive flags
|
||
|
@@ -4803,8 +4796,7 @@
|
||
|
*/
|
||
|
|
||
|
static int
|
||
|
-VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED
|
||
|
- struct socket *sock, // IN: socket to receive from
|
||
|
+VSockVmciStreamRecvmsg(struct socket *sock, // IN: socket to receive from
|
||
|
struct msghdr *msg, // IN/OUT: message to receive into
|
||
|
size_t len, // IN: length of receive buffer
|
||
|
int flags) // IN: receive flags
|