- ifdef ethtools methods removed in linux 3.3 from vmxnet

Changed files:
    open-vm-tools-kernel-3.3.patch -> 1.1
    open-vm-tools.spec -> 1.138

diff --git a/open-vm-tools-kernel-3.3.patch b/open-vm-tools-kernel-3.3.patch
new file mode 100644 (file)
index 0000000..1f21cc3
--- /dev/null
+++ b/open-vm-tools-kernel-3.3.patch
@@ -0,0 +1,18 @@
+--- open-vm-tools-8.8.2-590212/modules/linux/vmxnet/vmxnet.c~  2012-04-06 21:44:30.147182151 +0200
++++ open-vm-tools-8.8.2-590212/modules/linux/vmxnet/vmxnet.c   2012-04-06 22:20:15.724058800 +0200
+@@ -522,6 +522,7 @@
+    .get_settings        = vmxnet_get_settings,
+    .get_drvinfo         = vmxnet_get_drvinfo,
+    .get_link            = ethtool_op_get_link,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
+    .get_rx_csum         = vmxnet_get_rx_csum,
+    .set_rx_csum         = vmxnet_set_rx_csum,
+    .get_tx_csum         = vmxnet_get_tx_csum,
+@@ -535,6 +536,7 @@
+    .get_ufo             = ethtool_op_get_ufo,
+ #   endif
+ #endif
++#endif
+ };
+ 
+ 

diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index b6d058f0d50012897eb887bca28b07caff18bcda..e05c61a43fae8c107408a7702b63708c41457247 100644 (file)
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -27,6 +27,7 @@ Source2:      %{name}-modprobe.d
 Source3:       %{name}-init
 Source4:       %{name}-vmware-user.desktop
 Patch0:                %{name}-kernel-3.2.patch
+Patch1:                %{name}-kernel-3.3.patch
 URL:           http://open-vm-tools.sourceforge.net/
 BuildRequires: rpmbuild(macros) >= 1.453
 %if %{with userspace}
@@ -221,6 +222,7 @@ Moduł jądra Linuksa VMware vsock.
 #setup -q -n %{name}-%{snap}-%{rev}
 %setup -q -n %{name}-%{ver}-%{rev}
 %patch0 -p1
+%patch1 -p1
 
 cp %{SOURCE1} packaging
 %{__sed} -i -e 's|##{BUILD_OUTPUT}##|build|' docs/api/doxygen.conf