[gentoo-commits] gentoo-x86 commit in app-emulation/vmware-modules/files/patches/vmnet: 025_all_kernel-2.6.25.patch

[Mike Auty (ikelos)]

ikelos      08/04/26 14:38:54

  Added:                025_all_kernel-2.6.25.patch
  Log:
  Add patches for -r1 ebuilds to ensure they work on 2.6.25 and older kernels.
  (Portage version: 2.1.5_rc6)

Revision  Changes    Path
1.1                  app-emulation/vmware-modules/files/patches/vmnet/025_all_kernel-2.6.25.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/patches/vmnet/025_all_kernel-2.6.25.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/patches/vmnet/025_all_kernel-2.6.25.patch?rev=1.1&content-type=text/plain

Index: 025_all_kernel-2.6.25.patch
===================================================================
diff --git a/filter.c b/filter.c
index 7527fe4..7483c83 100644
--- a/filter.c
+++ b/filter.c
@@ -12,6 +12,13 @@
 #include <linux/ip.h>
 #include "compat_skbuff.h"
 #include <linux/netdevice.h>
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+#   define NF_IP_LOCAL_OUT NF_INET_LOCAL_OUT
+#   define NF_IP_LOCAL_IN NF_INET_LOCAL_IN
+#   define NF_IP_POST_ROUTING NF_INET_POST_ROUTING
+#endif
+
 /*
  * All this makes sense only if NETFILTER support is configured in our kernel.
  */
diff --git a/vmnetInt.h b/vmnetInt.h
index bf2dff9..483c457 100644
--- a/vmnetInt.h
+++ b/vmnetInt.h
@@ -78,8 +78,10 @@
  */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 65)
 #   define SET_SK_DEAD(_sk, _val) (_sk)->dead = (_val)
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
 #   define SET_SK_DEAD(_sk, _val) sock_valbool_flag(_sk, SOCK_DEAD, _val)
+#else
+#   define SET_SK_DEAD(_sk, _val) sock_set_flag(_sk, SOCK_DEAD)
 #endif
 
 



-- 
gentoo-commits@l.g.o mailing list