diff options
| author |   Vadim Kuznetsov <vadimk@gentoo.org> | 2012-01-06 21:23:43 +0000 |
|---|---|---|
| committer | Vadim Kuznetsov <vadimk@gentoo.org> | 2012-01-06 21:23:43 +0000 |
| commit | cdfdb61d29316e2865b0e2445700faf8b18436dd (patch) | |
| tree | a8c7288528a3a4283435bce34df5626e7cf8d3d0 /app-emulation/vmware-modules/files | |
| parent | vmware-modules: patch for 3.2 kernel (diff) | |
| download | vmware-cdfdb61d29316e2865b0e2445700faf8b18436dd.tar.gz vmware-cdfdb61d29316e2865b0e2445700faf8b18436dd.tar.bz2 vmware-cdfdb61d29316e2865b0e2445700faf8b18436dd.zip | |
vmware-modules: fixed patch for 3.2 kernel
svn path=/trunk/; revision=530
Diffstat (limited to 'app-emulation/vmware-modules/files')
| -rw-r--r-- | app-emulation/vmware-modules/files/264-3.2.0.patch | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/app-emulation/vmware-modules/files/264-3.2.0.patch b/app-emulation/vmware-modules/files/264-3.2.0.patch index 60a0be2..5baa61d 100644 --- a/app-emulation/vmware-modules/files/264-3.2.0.patch +++ b/app-emulation/vmware-modules/files/264-3.2.0.patch @@ -1,5 +1,5 @@ diff --git a/vmmon-only/linux/iommu.c b/vmmon-only/linux/iommu.c -index c692c2d..e8b6099 100644 +index c692c2d..501d602 100644 --- a/vmmon-only/linux/iommu.c +++ b/vmmon-only/linux/iommu.c @@ -42,6 +42,12 @@ @@ -31,14 +31,14 @@ index 491add5..74f7a3b 100644 #define VNET_FILTER_ACTION_DRP (1) #define VNET_FILTER_ACTION_DRP_SHORT (2) diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c -index 4bdb643..540301c 100644 +index 4bdb643..5b71339 100644 --- a/vmnet-only/netif.c +++ b/vmnet-only/netif.c @@ -62,7 +62,9 @@ static int VNetNetifClose(struct net_device *dev); static int VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev); static struct net_device_stats *VNetNetifGetStats(struct net_device *dev); static int VNetNetifSetMAC(struct net_device *dev, void *addr); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) static void VNetNetifSetMulticast(struct net_device *dev); +#endif #if 0 @@ -54,11 +54,21 @@ index 4bdb643..540301c 100644 /* * We cannot stuck... If someone will report problems under * low memory conditions or some such, we should enable it. -@@ -612,11 +616,12 @@ VNetNetifSetMAC(struct net_device *dev, // IN: +@@ -152,7 +156,9 @@ VNetNetIfSetup(struct net_device *dev) // IN: + dev->stop = VNetNetifClose; + dev->get_stats = VNetNetifGetStats; + dev->set_mac_address = VNetNetifSetMAC; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) + dev->set_multicast_list = VNetNetifSetMulticast; ++#endif + /* + * We cannot stuck... If someone will report problems under + * low memory conditions or some such, we should enable it. +@@ -612,11 +618,12 @@ VNetNetifSetMAC(struct net_device *dev, // IN: *---------------------------------------------------------------------- */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) void VNetNetifSetMulticast(struct net_device *dev) // IN: unused { |