summarylogtreecommitdiffstats
path: root/vmnet.patch
diff options
context:
space:
mode:
authorJean-Marc Lenoir2017-09-04 12:36:48 +0200
committerJean-Marc Lenoir2017-09-04 12:36:48 +0200
commit2f3e36382a9e2292e472795a84adcdda63d795e0 (patch)
tree7c3d0b3f12fb21a19ff19b42c0f92984cc644aec /vmnet.patch
parent41bbdb453555e168a77b95dba86dd1dd358f7502 (diff)
downloadaur-2f3e36382a9e2292e472795a84adcdda63d795e0.tar.gz
Compatibility with Linux 4.13
Automatically load VMware modules after first installation
Diffstat (limited to 'vmnet.patch')
-rw-r--r--vmnet.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/vmnet.patch b/vmnet.patch
index 9d3981ccab4a..112dbfe1495b 100644
--- a/vmnet.patch
+++ b/vmnet.patch
@@ -27,6 +27,21 @@ index 2d8e6f6..a14166b 100644
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, )
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, )
+diff --git a/vmnet/bridge.c b/vmnet/bridge.c
+--- a/vmnet/bridge.c
++++ b/vmnet/bridge.c
+@@ -636,7 +636,11 @@
+ unsigned long flags;
+ int i;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0)
+ atomic_inc(&clone->users);
++#else
++ clone = skb_get(clone);
++#endif
+
+ clone->dev = dev;
+ clone->protocol = eth_type_trans(clone, dev);
diff --git a/vmnet/driver.c b/vmnet/driver.c
index 7e7ad99..5f508f6 100644
--- a/vmnet/driver.c