diff options
Diffstat (limited to 'vsock.patch')
| -rw-r--r-- | vsock.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/vsock.patch b/vsock.patch index e6e341c58a34..4161edbd11d9 100644 --- a/vsock.patch +++ b/vsock.patch @@ -42,7 +42,7 @@ index bde1497..9f8f843 100644 #include "compat_cred.h" #include "compat_module.h" -@@ -212,7 +215,11 @@ +@@ -213,7 +216,11 @@ struct sockaddr *addr, int addrLen, int flags); static int VSockVmciStreamConnect(struct socket *sock, struct sockaddr *addr, int addrLen, int flags); @@ -54,7 +54,7 @@ index bde1497..9f8f843 100644 static int VSockVmciGetname(struct socket *sock, struct sockaddr *addr, int *addrLen, int peer); static unsigned int VSockVmciPoll(struct file *file, -@@ -232,13 +232,29 @@ static int VSockVmciStreamSetsockopt(struct socket *sock, int level, int optname +@@ -233,13 +240,29 @@ static int VSockVmciStreamSetsockopt(struct socket *sock, int level, int optname static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user * optlen); @@ -84,7 +84,7 @@ index bde1497..9f8f843 100644 struct msghdr *msg, size_t len, int flags); static int VSockVmciCreate( -@@ -2822,11 +2838,18 @@ __VSockVmciCreate(struct net *net, // IN: Network namespace +@@ -2872,11 +2895,18 @@ __VSockVmciCreate(struct net *net, // IN: Network namespace * From 2.6.9 to until 2.6.12 sk_alloc() used a cache in * the protocol structure, but you still had to specify the size and cache * yourself. @@ -105,7 +105,7 @@ index bde1497..9f8f843 100644 sk = sk_alloc(vsockVmciFamilyOps.family, priority, vsockVmciProto.slab_obj_size, vsockVmciProto.slab); #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) -@@ -3775,7 +3805,12 @@ +@@ -3825,7 +3855,12 @@ static int VSockVmciAccept(struct socket *sock, // IN struct socket *newsock, // IN/OUT @@ -118,7 +118,7 @@ index bde1497..9f8f843 100644 { struct sock *listener; int err; -@@ -4210,7 +4233,11 @@ VSockVmciShutdown(struct socket *sock, // IN +@@ -4260,7 +4295,11 @@ VSockVmciShutdown(struct socket *sock, // IN */ static int @@ -130,7 +130,7 @@ index bde1497..9f8f843 100644 struct socket *sock, // IN: socket to send on struct msghdr *msg, // IN: message to send size_t len) // IN: length of message -@@ -4302,7 +4329,11 @@ VSockVmciDgramSendmsg(struct kiocb *kiocb, // UNUSED +@@ -4352,7 +4391,11 @@ VSockVmciDgramSendmsg(struct kiocb *kiocb, // UNUSED goto out; } @@ -142,7 +142,7 @@ index bde1497..9f8f843 100644 dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port); dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port); -@@ -4540,7 +4571,11 @@ VSockVmciStreamGetsockopt(struct socket *sock, // IN +@@ -4590,7 +4633,11 @@ VSockVmciStreamGetsockopt(struct socket *sock, // IN */ static int @@ -154,7 +154,7 @@ index bde1497..9f8f843 100644 struct socket *sock, // IN: socket to send on struct msghdr *msg, // IN: message to send size_t len) // IN: length of message -@@ -4662,7 +4697,11 @@ VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED +@@ -4712,7 +4759,11 @@ VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED * able to send. */ @@ -166,7 +166,7 @@ index bde1497..9f8f843 100644 len - totalWritten, 0); if (written < 0) { err = -ENOMEM; -@@ -4709,7 +4748,11 @@ out: +@@ -4759,7 +4810,11 @@ out: */ static int @@ -178,7 +178,7 @@ index bde1497..9f8f843 100644 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 -@@ -4759,7 +4802,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kiocb, // UNUSED +@@ -4809,7 +4864,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kiocb, // UNUSED } /* Place the datagram payload in the user's iovec. */ @@ -190,7 +190,7 @@ index bde1497..9f8f843 100644 if (err) { goto out; } -@@ -4800,7 +4847,11 @@ out: +@@ -4850,7 +4909,11 @@ out: */ static int @@ -202,7 +202,7 @@ index bde1497..9f8f843 100644 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 -@@ -4905,9 +4956,17 @@ VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED +@@ -4955,9 +5018,17 @@ VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED } if (flags & MSG_PEEK) { |