Fix compatibility with Linux 6.9

3 files changed, 21 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1c2c26263b2..dc9338b3938e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -106,6 +106,6 @@ pkgbase = vmware-workstation14
 	sha256sums = 10562d11d50edab9abc2b29c8948714edcb9b084f99b3766d07ddd21259e372e
 	sha256sums = 273d4357599a3e54259c78cc49054fef8ecfd2c2eda35cbcde3a53a62777a5ac
 	sha256sums = 1789d14b184792db3fe0191aba0e4f733097dc058e73bf8c20a0a40cba74bfd8
-	sha256sums = 42cd9eeca74db7ab9493ca8824b41d7aec837992ac273f1b32601a222d654388
+	sha256sums = 638a6513fa4056a29198ec13103a2bbe1dd4fefa484f78f0a7edb3b30400af8f
 
 pkgname = vmware-workstation14
diff --git a/PKGBUILD b/PKGBUILD
index 9e2b966d2533..015851b1497f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -143,7 +143,7 @@ sha256sums=(
   '10562d11d50edab9abc2b29c8948714edcb9b084f99b3766d07ddd21259e372e'
   '273d4357599a3e54259c78cc49054fef8ecfd2c2eda35cbcde3a53a62777a5ac'
   '1789d14b184792db3fe0191aba0e4f733097dc058e73bf8c20a0a40cba74bfd8'
-  '42cd9eeca74db7ab9493ca8824b41d7aec837992ac273f1b32601a222d654388'
+  '638a6513fa4056a29198ec13103a2bbe1dd4fefa484f78f0a7edb3b30400af8f'
 )
 options=(!strip emptydirs !debug)
 
diff --git a/vmnet.patch b/vmnet.patch
index 04f8080b22d3..b8886fe6c4bd 100644
--- a/vmnet.patch
+++ b/vmnet.patch
@@ -580,3 +580,22 @@ index 5f41269d..cb25e3b8 100644
  
  /*
   *----------------------------------------------------------------------
+Patch for Linux 6.9 from https://github.com/mkubecek/vmware-host-modules/issues/239
+--- a/vmnet-only/vmnetInt.h
++++ b/vmnet-only/vmnetInt.h
+@@ -41,8 +41,13 @@
+     compat_skb_set_network_header(skb, sizeof (struct ethhdr)),  \
+     dev_queue_xmit(skb)                                   \
+   )
+-#define dev_lock_list()    read_lock(&dev_base_lock)
+-#define dev_unlock_list()  read_unlock(&dev_base_lock)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 9, 0)
++#   define dev_lock_list()    rcu_read_lock()
++#   define dev_unlock_list()  rcu_read_unlock()
++#else
++#   define dev_lock_list()    read_lock(&dev_base_lock)
++#   define dev_unlock_list()  read_unlock(&dev_base_lock)
++#endif
+ 
+ 
+ extern struct proto vmnet_proto;