From: VMware, Inc <>
Date: Thu, 17 Jun 2010 21:12:27 +0000 (-0700)
Subject: Change Linux kernel version check to 2.6.32 to fix build error.
X-Git-Tag: 2010.06.16-268169~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdbf0beefa48677a0fcf14aea3b07b95a0a0d9c7;p=thirdparty%2Fopen-vm-tools.git

Change Linux kernel version check to 2.6.32 to fix build error.

While creating PBMs for Ubuntu 10.04 RC, which is a 2.6.32-21.32
kernel, we were getting a compile-time error due to type mismatch
for the setsockopt prototype. An earlier change to this file assumed
that the error would occur on 2.6.34 or later, but in fact it is
a problem starting with 2.6.32-rc3.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/modules/linux/vsock/linux/af_vsock.c b/open-vm-tools/modules/linux/vsock/linux/af_vsock.c
index c0743e8be..3464f0d10 100644
--- a/open-vm-tools/modules/linux/vsock/linux/af_vsock.c
+++ b/open-vm-tools/modules/linux/vsock/linux/af_vsock.c
@@ -209,8 +209,7 @@ static unsigned int VSockVmciPoll(struct file *file,
 static int VSockVmciListen(struct socket *sock, int backlog);
 static int VSockVmciShutdown(struct socket *sock, int mode);
 
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
 typedef int VSockSetsockoptLenType;
 #else
 typedef unsigned int VSockSetsockoptLenType;