| 1 |
vadimk 12/01/06 21:29:50 |
| 2 |
|
| 3 |
Modified: 264-3.2.0.patch |
| 4 |
Log: |
| 5 |
fixed patch for 3.2.0 kernel . Bug 397733. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-emulation/vmware-modules/files/264-3.2.0.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/264-3.2.0.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/264-3.2.0.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/264-3.2.0.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: 264-3.2.0.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/files/264-3.2.0.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- 264-3.2.0.patch 6 Jan 2012 14:30:38 -0000 1.1 |
| 23 |
+++ 264-3.2.0.patch 6 Jan 2012 21:29:50 -0000 1.2 |
| 24 |
@@ -1,5 +1,5 @@ |
| 25 |
diff --git a/vmmon-only/linux/iommu.c b/vmmon-only/linux/iommu.c |
| 26 |
-index c692c2d..e8b6099 100644 |
| 27 |
+index c692c2d..501d602 100644 |
| 28 |
--- a/vmmon-only/linux/iommu.c |
| 29 |
+++ b/vmmon-only/linux/iommu.c |
| 30 |
@@ -42,6 +42,12 @@ |
| 31 |
@@ -31,14 +31,14 @@ |
| 32 |
#define VNET_FILTER_ACTION_DRP (1) |
| 33 |
#define VNET_FILTER_ACTION_DRP_SHORT (2) |
| 34 |
diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c |
| 35 |
-index 4bdb643..540301c 100644 |
| 36 |
+index 4bdb643..5b71339 100644 |
| 37 |
--- a/vmnet-only/netif.c |
| 38 |
+++ b/vmnet-only/netif.c |
| 39 |
@@ -62,7 +62,9 @@ static int VNetNetifClose(struct net_device *dev); |
| 40 |
static int VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev); |
| 41 |
static struct net_device_stats *VNetNetifGetStats(struct net_device *dev); |
| 42 |
static int VNetNetifSetMAC(struct net_device *dev, void *addr); |
| 43 |
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) |
| 44 |
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) |
| 45 |
static void VNetNetifSetMulticast(struct net_device *dev); |
| 46 |
+#endif |
| 47 |
#if 0 |
| 48 |
@@ -54,11 +54,21 @@ |
| 49 |
/* |
| 50 |
* We cannot stuck... If someone will report problems under |
| 51 |
* low memory conditions or some such, we should enable it. |
| 52 |
-@@ -612,11 +616,12 @@ VNetNetifSetMAC(struct net_device *dev, // IN: |
| 53 |
+@@ -152,7 +156,9 @@ VNetNetIfSetup(struct net_device *dev) // IN: |
| 54 |
+ dev->stop = VNetNetifClose; |
| 55 |
+ dev->get_stats = VNetNetifGetStats; |
| 56 |
+ dev->set_mac_address = VNetNetifSetMAC; |
| 57 |
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) |
| 58 |
+ dev->set_multicast_list = VNetNetifSetMulticast; |
| 59 |
++#endif |
| 60 |
+ /* |
| 61 |
+ * We cannot stuck... If someone will report problems under |
| 62 |
+ * low memory conditions or some such, we should enable it. |
| 63 |
+@@ -612,11 +618,12 @@ VNetNetifSetMAC(struct net_device *dev, // IN: |
| 64 |
*---------------------------------------------------------------------- |
| 65 |
*/ |
| 66 |
|
| 67 |
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) |
| 68 |
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) |
| 69 |
void |
| 70 |
VNetNetifSetMulticast(struct net_device *dev) // IN: unused |
| 71 |
{ |
Archives