Update for kernel changes

4 files changed, 111 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ababab7a2f9..fc0751162e6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vmware-modules-dkms
 	pkgdesc = VMware Workstation kernel modules (DKMS)
 	pkgver = 308.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.vmware.com/
 	install = vmware-modules-dkms.install
 	arch = i686
@@ -23,11 +23,11 @@ pkgbase = vmware-modules-dkms
 	sha256sums = ee3e5cfac51703ac392bce540e3375680c579eaac7aa31990e1e08ada589e89b
 	sha256sums = 7baecdfd979d57aed7dac0db57e0165fc1730b15ed6bf42ed25571e68ec34b52
 	sha256sums = 707596776b0b232f7f5de4a0ddff12262df3bc934180afd956ea2ee45ac4db9e
-	sha256sums = ebe4d463c878b134c37e7382198f0771eb73d5952201ac28ead62242ea11da88
+	sha256sums = 3f6bcef6e88718a4d2b5aba8a10856ad0857006755c2ccaa5de8fc596441770c
 	sha256sums = f009eba206644a97de7d7cd080a1e4517eb2c452984e3df53e94dbe2c887e4ce
 	sha256sums = 06fc4a6d3c89b147089bca1f6df3b4fc58e819e4a089b76acf0f2463ee0fa215
 	sha256sums = fe0018729d8ee9c2a333e9ab2125ea9e228613a743b4a692ad39a06cda7568c2
-	sha256sums = eb17a0563f8e9e1e5667e73a167c397e626ef7ab65cb7c10f418b421a36cf714
+	sha256sums = 324f15cfa838e130a879ab1054a9efd0ef6378854817024f1a1617b57fb55cb9
 
 pkgname = vmware-modules-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index 488575b3930f..e6511a63a49e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=vmware-modules-dkms
 _pkgbase=vmware-modules
 pkgver=308.0
-pkgrel=1
+pkgrel=2
 pkgdesc="VMware Workstation kernel modules (DKMS)"
 arch=('i686' 'x86_64')
 url="http://www.vmware.com/"
@@ -33,11 +33,11 @@ source=('Makefile'
 sha256sums=('ee3e5cfac51703ac392bce540e3375680c579eaac7aa31990e1e08ada589e89b'
             '7baecdfd979d57aed7dac0db57e0165fc1730b15ed6bf42ed25571e68ec34b52'
             '707596776b0b232f7f5de4a0ddff12262df3bc934180afd956ea2ee45ac4db9e'
-            'ebe4d463c878b134c37e7382198f0771eb73d5952201ac28ead62242ea11da88'
+            '3f6bcef6e88718a4d2b5aba8a10856ad0857006755c2ccaa5de8fc596441770c'
             'f009eba206644a97de7d7cd080a1e4517eb2c452984e3df53e94dbe2c887e4ce'
             '06fc4a6d3c89b147089bca1f6df3b4fc58e819e4a089b76acf0f2463ee0fa215'
             'fe0018729d8ee9c2a333e9ab2125ea9e228613a743b4a692ad39a06cda7568c2'
-            'eb17a0563f8e9e1e5667e73a167c397e626ef7ab65cb7c10f418b421a36cf714')
+            '324f15cfa838e130a879ab1054a9efd0ef6378854817024f1a1617b57fb55cb9')
 
 build()
 {
diff --git a/vmci.patch b/vmci.patch
index 2398f839bc19..465fa2dd6192 100644
--- a/vmci.patch
+++ b/vmci.patch
@@ -1,11 +1,5 @@
- vmci/linux/{ => }/driver.c             | 15 ++++++++++++++-
- vmci/linux/{ => }/vmciKernelIf.c       | 17 +++++++++++++++++
- vmci/shared/{ => }/vm_device_version.h |  2 ++
- vmci/shared/{ => }/vmci_kernel_if.h    |  2 +-
- 4 files changed, 34 insertions(+), 2 deletions(-)
-
 diff --git a/vmci/linux/driver.c b/vmci/linux/driver.c
-index 64a3cca..4bde0cc 100644
+index 64a3cca..08ec0c5 100644
 --- a/vmci/linux/driver.c
 +++ b/vmci/linux/driver.c
 @@ -26,6 +26,7 @@
@@ -61,6 +55,23 @@ index 64a3cca..4bde0cc 100644
        guestDeviceInit = FALSE;
     }
  
+@@ -2479,12 +2492,16 @@ vmci_exit(void)
+ 
+       VMCI_HostCleanup();
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+       retval = misc_deregister(&linuxState.misc);
+       if (retval) {
+          Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME);
+       } else {
+          Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
+       }
++#else
++      misc_deregister(&linuxState.misc);
++#endif
+ 
+       hostDeviceInit = FALSE;
+    }
 diff --git a/vmci/linux/vmciKernelIf.c b/vmci/linux/vmciKernelIf.c
 index 8b1788f..15766bf 100644
 --- a/vmci/linux/vmciKernelIf.c
diff --git a/vsock.patch b/vsock.patch
index d22ae0c34fb3..db88a7341e79 100644
--- a/vsock.patch
+++ b/vsock.patch
@@ -1,13 +1,40 @@
- vsock/linux/{ => }/af_vsock.c     | 23 ++++++++++++++++++++---
- vsock/linux/{ => }/notify.c       |  4 ++++
- vsock/linux/{ => }/notifyQState.c |  8 ++++++++
- 3 files changed, 32 insertions(+), 3 deletions(-)
-
 diff --git a/vsock/linux/af_vsock.c b/vsock/linux/af_vsock.c
-index bde1497..dc810a7 100644
+index bde1497..46d505f 100644
 --- a/vsock/linux/af_vsock.c
 +++ b/vsock/linux/af_vsock.c
-@@ -2826,7 +2826,9 @@ __VSockVmciCreate(struct net *net,       // IN: Network namespace
+@@ -232,13 +232,27 @@ 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);
+ 
+-static int VSockVmciDgramSendmsg(struct kiocb *kiocb,
++static int VSockVmciDgramSendmsg(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
++                                 struct kiocb *kiocb,
++#endif
+                                  struct socket *sock, struct msghdr *msg, size_t len);
+-static int VSockVmciDgramRecvmsg(struct kiocb *kiocb, struct socket *sock,
++static int VSockVmciDgramRecvmsg(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
++                                 struct kiocb *kiocb,
++#endif
++                                 struct socket *sock,
+                                  struct msghdr *msg, size_t len, int flags);
+-static int VSockVmciStreamSendmsg(struct kiocb *kiocb,
++static int VSockVmciStreamSendmsg(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
++                                 struct kiocb *kiocb,
++#endif
+                                  struct socket *sock, struct msghdr *msg, size_t len);
+-static int VSockVmciStreamRecvmsg(struct kiocb *kiocb, struct socket *sock,
++static int VSockVmciStreamRecvmsg(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
++                                 struct kiocb *kiocb,
++#endif
++                                 struct socket *sock,
+                                  struct msghdr *msg, size_t len, int flags);
+ 
+ static int VSockVmciCreate(
+@@ -2826,7 +2840,9 @@ __VSockVmciCreate(struct net *net,       // IN: Network namespace
      * network namespace, and the option to zero the sock was dropped.
      *
      */
@@ -18,7 +45,19 @@ index bde1497..dc810a7 100644
     sk = sk_alloc(vsockVmciFamilyOps.family, priority,
                   vsockVmciProto.slab_obj_size, vsockVmciProto.slab);
  #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
-@@ -4302,7 +4304,7 @@ VSockVmciDgramSendmsg(struct kiocb *kiocb,          // UNUSED
+@@ -4210,7 +4226,10 @@ VSockVmciShutdown(struct socket *sock,  // IN
+  */
+ 
+ static int
+-VSockVmciDgramSendmsg(struct kiocb *kiocb,          // UNUSED
++VSockVmciDgramSendmsg(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
++                      struct kiocb *kiocb,          // UNUSED
++#endif
+                       struct socket *sock,          // IN: socket to send on
+                       struct msghdr *msg,           // IN: message to send
+                       size_t len)                   // IN: length of message
+@@ -4302,7 +4321,7 @@ VSockVmciDgramSendmsg(struct kiocb *kiocb,          // UNUSED
        goto out;
     }
  
@@ -27,7 +66,19 @@ index bde1497..dc810a7 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);
-@@ -4662,7 +4664,11 @@ VSockVmciStreamSendmsg(struct kiocb *kiocb,          // UNUSED
+@@ -4540,7 +4559,10 @@ VSockVmciStreamGetsockopt(struct socket *sock,          // IN
+  */
+ 
+ static int
+-VSockVmciStreamSendmsg(struct kiocb *kiocb,          // UNUSED
++VSockVmciStreamSendmsg(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
++                       struct kiocb *kiocb,          // UNUSED
++#endif
+                        struct socket *sock,          // IN: socket to send on
+                        struct msghdr *msg,           // IN: message to send
+                        size_t len)                   // IN: length of message
+@@ -4662,7 +4684,11 @@ VSockVmciStreamSendmsg(struct kiocb *kiocb,          // UNUSED
         * able to send.
         */
  
@@ -39,7 +90,19 @@ index bde1497..dc810a7 100644
                                    len - totalWritten, 0);
        if (written < 0) {
           err = -ENOMEM;
-@@ -4721,6 +4727,7 @@ VSockVmciDgramRecvmsg(struct kiocb *kiocb,          // UNUSED
+@@ -4709,7 +4735,10 @@ out:
+  */
+ 
+ static int
+-VSockVmciDgramRecvmsg(struct kiocb *kiocb,          // UNUSED
++VSockVmciDgramRecvmsg(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
++                      struct kiocb *kiocb,          // UNUSED
++#endif
+                       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
+@@ -4721,6 +4750,7 @@ VSockVmciDgramRecvmsg(struct kiocb *kiocb,          // UNUSED
     VMCIDatagram *dg;
     size_t payloadLen;
     struct sk_buff *skb;
@@ -47,7 +110,7 @@ index bde1497..dc810a7 100644
  
     sk = sock->sk;
     noblock = flags & MSG_DONTWAIT;
-@@ -4759,7 +4766,9 @@ VSockVmciDgramRecvmsg(struct kiocb *kiocb,          // UNUSED
+@@ -4759,7 +4789,9 @@ VSockVmciDgramRecvmsg(struct kiocb *kiocb,          // UNUSED
     }
  
     /* Place the datagram payload in the user's iovec. */
@@ -58,7 +121,19 @@ index bde1497..dc810a7 100644
     if (err) {
        goto out;
     }
-@@ -4905,9 +4914,17 @@ VSockVmciStreamRecvmsg(struct kiocb *kiocb,          // UNUSED
+@@ -4800,7 +4832,10 @@ out:
+  */
+ 
+ static int
+-VSockVmciStreamRecvmsg(struct kiocb *kiocb,          // UNUSED
++VSockVmciStreamRecvmsg(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
++                       struct kiocb *kiocb,          // UNUSED
++#endif
+                        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 +4940,17 @@ VSockVmciStreamRecvmsg(struct kiocb *kiocb,          // UNUSED
           }
  
           if (flags & MSG_PEEK) {