Fix compatibility with Linux 6.9

3 files changed, 21 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e752cb1b2580..a25c5de70c1f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -72,6 +72,6 @@ pkgbase = vmware-workstation
 	sha256sums = 10562d11d50edab9abc2b29c8948714edcb9b084f99b3766d07ddd21259e372e
 	sha256sums = 273d4357599a3e54259c78cc49054fef8ecfd2c2eda35cbcde3a53a62777a5ac
 	sha256sums = 2bd592c28c383264a14167ddca8686912ddbadb1ba16d40560d75b082d439ed7
-	sha256sums = 4332a189c79ce15fa4d59dc45cffc78f42f48cfbb059b5eeafbb43a9cac835ba
+	sha256sums = b4fd63440e6829d8d73055d23e451386837683e2ac1e84549d58a748b486743a
 
 pkgname = vmware-workstation
diff --git a/PKGBUILD b/PKGBUILD
index 5322d5f4f21f..1334fd41f1ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -108,7 +108,7 @@ sha256sums=(
   '10562d11d50edab9abc2b29c8948714edcb9b084f99b3766d07ddd21259e372e'
   '273d4357599a3e54259c78cc49054fef8ecfd2c2eda35cbcde3a53a62777a5ac'
   '2bd592c28c383264a14167ddca8686912ddbadb1ba16d40560d75b082d439ed7'
-  '4332a189c79ce15fa4d59dc45cffc78f42f48cfbb059b5eeafbb43a9cac835ba'
+  'b4fd63440e6829d8d73055d23e451386837683e2ac1e84549d58a748b486743a'
 )
 options=(!strip emptydirs !debug)
 
diff --git a/vmnet.patch b/vmnet.patch
index 7adcf178cd7a..075b97d50c25 100644
--- a/vmnet.patch
+++ b/vmnet.patch
@@ -173,3 +173,22 @@ index f6a90a13..e76dcf5c 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;