summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Kitsinger (SwooshyCueb)2016-05-26 01:22:25 -0500
committerMarkus Kitsinger (SwooshyCueb)2016-05-26 01:22:25 -0500
commitc09a9ce303fcfd92e4978ee0997c3ddd985d0230 (patch)
tree0f809c350464e1f8d3c5b3ae204cd9c6a70cf455
parent95f36ac986049e9ca178b9cc2bb7f2ec82f01b0a (diff)
downloadaur-c09a9ce303fcfd92e4978ee0997c3ddd985d0230.tar.gz
Tweaks for vmnet patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--vmnet.patch26
3 files changed, 21 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 34be762241bb..983e7667e2a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = vmware-modules-dkms
pkgdesc = VMware Workstation kernel modules (DKMS)
pkgver = 308.0
- pkgrel = 6
+ pkgrel = 7
url = http://www.vmware.com/
install = vmware-modules-dkms.install
arch = i686
@@ -26,7 +26,7 @@ pkgbase = vmware-modules-dkms
sha256sums = 48951fcb72e1f964e21dc3f7ea4729dd673936abdd28b54008dbca9b0967683f
sha256sums = 3f6bcef6e88718a4d2b5aba8a10856ad0857006755c2ccaa5de8fc596441770c
sha256sums = 9a1973abf269d7c9d49b8789e7a2e55595e712e644b2eade849fa19510b0c2f3
- sha256sums = fe0018729d8ee9c2a333e9ab2125ea9e228613a743b4a692ad39a06cda7568c2
+ sha256sums = 2eb2ad24722e0ddd97387c48266295204aea95de8970eec427e3931769d15e19
sha256sums = a97e5096ef1b1595b2d1ed6b86b0fde80e34c6310f566156bcd4f5d660a74a58
pkgname = vmware-modules-dkms
diff --git a/PKGBUILD b/PKGBUILD
index cbe69f659f69..9a76f7d464ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
pkgname=vmware-modules-dkms
_pkgbase=vmware-modules
pkgver=308.0
-pkgrel=6
+pkgrel=7
pkgdesc="VMware Workstation kernel modules (DKMS)"
arch=('i686' 'x86_64')
url="http://www.vmware.com/"
@@ -36,7 +36,7 @@ sha256sums=('ee3e5cfac51703ac392bce540e3375680c579eaac7aa31990e1e08ada589e89b'
'48951fcb72e1f964e21dc3f7ea4729dd673936abdd28b54008dbca9b0967683f'
'3f6bcef6e88718a4d2b5aba8a10856ad0857006755c2ccaa5de8fc596441770c'
'9a1973abf269d7c9d49b8789e7a2e55595e712e644b2eade849fa19510b0c2f3'
- 'fe0018729d8ee9c2a333e9ab2125ea9e228613a743b4a692ad39a06cda7568c2'
+ '2eb2ad24722e0ddd97387c48266295204aea95de8970eec427e3931769d15e19'
'a97e5096ef1b1595b2d1ed6b86b0fde80e34c6310f566156bcd4f5d660a74a58')
build()
diff --git a/vmnet.patch b/vmnet.patch
index a5250d942d43..910cbc07c8f8 100644
--- a/vmnet.patch
+++ b/vmnet.patch
@@ -1,19 +1,27 @@
- vmnet/{ => }/vm_device_version.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
diff --git a/vmnet/vm_device_version.h b/vmnet/vm_device_version.h
-index e2cb477..bca4547 100644
+index e2cb477..3dd7097 100644
--- a/vmnet/vm_device_version.h
+++ b/vmnet/vm_device_version.h
-@@ -53,7 +53,10 @@
+@@ -53,7 +53,9 @@
* VMware HD Audio codec
* VMware HD Audio controller
*/
--#define PCI_VENDOR_ID_VMWARE 0x15AD
-+#ifdef PCI_VENDOR_ID_VMWARE
-+# undef PCI_VENDOR_ID_VMWARE
-+# define PCI_VENDOR_ID_VMWARE 0x15AD
++#ifndef PCI_VENDOR_ID_VMWARE
+ #define PCI_VENDOR_ID_VMWARE 0x15AD
+#endif
#define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405
#define PCI_DEVICE_ID_VMWARE_SVGA 0x0710
#define PCI_DEVICE_ID_VMWARE_VGA 0x0711
+diff --git a/vmnet/vmnetInt.h b/vmnet/vmnetInt.h
+index 0ee52ec..96060a3 100644
+--- a/vmnet/vmnetInt.h
++++ b/vmnet/vmnetInt.h
+@@ -79,7 +79,7 @@
+ extern struct proto vmnet_proto;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+ # define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \
+- PF_NETLINK, _pri, &vmnet_proto, 1)
++ PF_NETLINK, _pri, &vmnet_proto, 0)
+ #elif defined(VMW_NETDEV_HAS_NET)
+ # define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \
+ PF_NETLINK, _pri, &vmnet_proto)