add support for kernel 4.13.1

4 files changed, 23 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99790462f297..4e292e1497ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# 一 7月  3 13:43:45 UTC 2017
+# 六 9月 16 13:47:43 UTC 2017
 pkgbase = vmware-patch
 	pkgdesc = A post-install configuration solution for VMware Workstation (Pro) and Player (Plus and Pro)
 	pkgver = 12.5.7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wiki.archlinux.org/index.php/VMware#Configuration
 	install = vmware-patch.install
 	arch = i686
@@ -20,6 +20,7 @@ pkgbase = vmware-patch
 	source = vmware.service
 	source = vmware-usbarbitrator.service
 	source = vmware-workstation.service
+	source = vmnet-12.5.7-4.13.patch
 	source = vmmon-12.5.2-4.9.patch
 	source = vmnet-12.5.2-4.9.patch
 	source = vmci-12.0.0-4.2.patch
@@ -40,12 +41,13 @@ pkgbase = vmware-patch
 	source = vmnet-10.0.4-3.14.patch
 	source = vsock-10.0.4-3.14.patch
 	source = vmnet-10.0.1-3.13.patch
-	md5sums = 1c6481197401d02c6096bcf107861119
+	md5sums = 9ddd739d1327a56f7adbf121fa0076d1
 	md5sums = ba054b375308442d43a408dbae5e9401
 	md5sums = ca1382966804d694894539c7bcac6bbb
 	md5sums = c12e765985b324585a548718a6ac9b43
 	md5sums = ea3817fb7952932707bfedcf33a70697
 	md5sums = 56f7f642683e54250372bb57faaf4e95
+	md5sums = a2c3e2bbbe6dcbf66737a5e33df5b892
 	md5sums = 7acdc91c88c64d55bd775d2fcdc1b242
 	md5sums = 5eb0567825f0dea3d7c9f21038463de9
 	md5sums = 133f3ba5c19ceb00a4ae8f44dc08352a
diff --git a/PKGBUILD b/PKGBUILD
index 32e5a12135ab..1a398e4d5a7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=vmware-patch
 pkgver=12.5.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A post-install configuration solution for VMware Workstation (Pro) and Player (Plus and Pro)"
 arch=('i686' 'x86_64')
 url="https://wiki.archlinux.org/index.php/VMware#Configuration"
@@ -12,6 +12,8 @@ depends=('fuse' 'gtkmm' 'linux-headers' 'ncurses5-compat-libs')
 options=('!emptydirs')
 install=$pkgname.install
 source=('vmware-patch.sh' 'vmware-unpatch.sh' 'common-functions.sh' 'vmware.service' 'vmware-usbarbitrator.service' 'vmware-workstation.service'
+        # Workstation Pro/Player 12.5.7
+        'vmnet-12.5.7-4.13.patch'
         # Workstation Pro/Player 12.5.2
         'vmmon-12.5.2-4.9.patch'
         'vmnet-12.5.2-4.9.patch'
@@ -60,12 +62,13 @@ package() {
 }
 
 # Generated using 'updpkgsums'
-md5sums=('1c6481197401d02c6096bcf107861119'
+md5sums=('9ddd739d1327a56f7adbf121fa0076d1'
          'ba054b375308442d43a408dbae5e9401'
          'ca1382966804d694894539c7bcac6bbb'
          'c12e765985b324585a548718a6ac9b43'
          'ea3817fb7952932707bfedcf33a70697'
          '56f7f642683e54250372bb57faaf4e95'
+         'a2c3e2bbbe6dcbf66737a5e33df5b892'
          '7acdc91c88c64d55bd775d2fcdc1b242'
          '5eb0567825f0dea3d7c9f21038463de9'
          '133f3ba5c19ceb00a4ae8f44dc08352a'
diff --git a/vmnet-12.5.7-4.13.patch b/vmnet-12.5.7-4.13.patch
new file mode 100644
index 000000000000..4c448dbd50e8
--- /dev/null
+++ b/vmnet-12.5.7-4.13.patch
@@ -0,0 +1,12 @@
+diff -Naur vmnet-only.orig/bridge.c vmnet-only/bridge.c
+--- vmnet-only/bridge.c	2017-06-26 22:08:39.148034785 +1000
++++ vmnet-only/bridge.c	2017-07-16 11:37:01.325802125 +1000
+@@ -636,7 +636,7 @@
+ 	 unsigned long flags;
+ 	 int i;
+ 
+-	 atomic_inc(&clone->users);
++	 clone = skb_get(clone);
+ 
+ 	 clone->dev = dev;
+ 	 clone->protocol = eth_type_trans(clone, dev);
diff --git a/vmware-patch.sh b/vmware-patch.sh
index fdbbcc7dfe38..3ebf9cf94944 100644
--- a/vmware-patch.sh
+++ b/vmware-patch.sh
@@ -63,7 +63,7 @@ set_product_name
 
 # Use VMware's bundled libcurl.so.4 to prevent crashes at startup/checking for updates
 if [[ $ver != 13.* ]]; then
-    for script in vmware vmplayer vmware-netcfg; do
+    for script in vmware vmplayer vmware-netcfg vmware-tray; do
         if [[ -f /usr/bin/$script ]]; then
             if ! grep -q "VMWARE_USE_SHIPPED_LIBS" /usr/bin/$script; then
                 sed '/export PRODUCT_NAME/aexport VMWARE_USE_SHIPPED_LIBS=yes' \