| 1 |
ikelos 09/01/14 23:05:51 |
| 2 |
|
| 3 |
Modified: 030_all_kernel-2.6.27.patch |
| 4 |
Log: |
| 5 |
Third time lucky, more patches for < 2.6.26 kernels. |
| 6 |
(Portage version: 2.2_rc22/cvs/Linux 2.6.28 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: 030_all_kernel-2.6.27.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/files/patches/vmnet/030_all_kernel-2.6.27.patch,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- 030_all_kernel-2.6.27.patch 14 Jan 2009 00:06:05 -0000 1.3 |
| 22 |
+++ 030_all_kernel-2.6.27.patch 14 Jan 2009 23:05:51 -0000 1.4 |
| 23 |
@@ -1,12 +1,12 @@ |
| 24 |
diff --git a/bridge.c b/bridge.c |
| 25 |
-index cdf9e0b..f46031b 100644 |
| 26 |
+index cdf9e0b..de78618 100644 |
| 27 |
--- a/bridge.c |
| 28 |
+++ b/bridge.c |
| 29 |
@@ -275,7 +275,11 @@ VNetBridgeDevCompatible(VNetBridge *bridge, // IN: Bridge |
| 30 |
struct net_device *net) // IN: Network device |
| 31 |
{ |
| 32 |
#ifdef VMW_NETDEV_HAS_NET |
| 33 |
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25) |
| 34 |
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) |
| 35 |
+ if (dev_net(net) != dev_net(bridge->internalDev)) { |
| 36 |
+#else |
| 37 |
if (net->nd_net != bridge->internalDev->nd_net) { |
| 38 |
@@ -53,24 +53,32 @@ |
| 39 |
} |
| 40 |
|
| 41 |
diff --git a/vmnetInt.h b/vmnetInt.h |
| 42 |
-index 483c457..551be73 100644 |
| 43 |
+index 483c457..2328ec6 100644 |
| 44 |
--- a/vmnetInt.h |
| 45 |
+++ b/vmnetInt.h |
| 46 |
-@@ -63,7 +63,7 @@ |
| 47 |
+@@ -63,7 +63,11 @@ |
| 48 |
# define dev_lock_list() read_lock(&dev_base_lock) |
| 49 |
# define dev_unlock_list() read_unlock(&dev_base_lock) |
| 50 |
# ifdef VMW_NETDEV_HAS_NET |
| 51 |
--# define DEV_GET(x) __dev_get_by_name((x)->internalDev->nd_net, (x)->name) |
| 52 |
++# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) |
| 53 |
+ # define DEV_GET(x) __dev_get_by_name((x)->internalDev->nd_net, (x)->name) |
| 54 |
++# else |
| 55 |
+# define DEV_GET(x) __dev_get_by_name(dev_net((x)->internalDev), (x)->name) |
| 56 |
++# endif |
| 57 |
# else |
| 58 |
# define DEV_GET(x) __dev_get_by_name((x)->name) |
| 59 |
# endif |
| 60 |
-@@ -87,7 +87,7 @@ |
| 61 |
+@@ -87,8 +91,13 @@ |
| 62 |
|
| 63 |
#ifdef VMW_NETDEV_HAS_NET |
| 64 |
extern struct proto vmnet_proto; |
| 65 |
--# define compat_sk_alloc(_bri, _pri) sk_alloc((_bri)->internalDev->nd_net, \ |
| 66 |
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) |
| 67 |
+# define compat_sk_alloc(_bri, _pri) sk_alloc(dev_net((_bri)->internalDev), \ |
| 68 |
++ PF_NETLINK, _pri, &vmnet_proto) |
| 69 |
++# else |
| 70 |
+ # define compat_sk_alloc(_bri, _pri) sk_alloc((_bri)->internalDev->nd_net, \ |
| 71 |
PF_NETLINK, _pri, &vmnet_proto) |
| 72 |
++# endif |
| 73 |
#elif defined(VMW_HAVE_SK_ALLOC_WITH_PROTO) |
| 74 |
extern struct proto vmnet_proto; |
| 75 |
+ # define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1) |
Archives