Merge lp:~n-muench/ubuntu/maverick/open-vm-tools/open-vm-tools-fix-598542 into lp:ubuntu/maverick/open-vm-tools

[Nate Muench (Mink)]

This proposal adds support to Maverick kernels. There is a newer upstream available, which Debian has pushed to their repos. I would've pushed that new version in this branch, with the fixes for the Maverick kernel (including the adjusted patches), but I don't know what other changes need to be made for the newer version. So I guess I want to fix the old thing that's broken, instead of pushing the new version, that might cause more problems.

Also, I'm sorry, I know this branch as been disappearing and appearing again, but I'm trying to get this proposal as perfect as possible. I'm still getting a hold of this.

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-29 17:35:25 +0000
+++ debian/changelog	2010-07-19 23:13:47 +0000
@@ -1,3 +1,9 @@
+open-vm-tools (2010.04.25-253928-2+ubuntu2) maverick; urgency=low
+
+  * Fixes building on Maverick kernels (LP: #598542).
+
+ -- Nate Muench <[e-mail]>  Mon, 19 Jul 2010 18:01:17 -0500
+
 open-vm-tools (2010.04.25-253928-2+ubuntu1) maverick; urgency=low
 
   * Merge from debian testing, remaining changes:

=== added file 'debian/patches/03-vmxnet.patch'
--- debian/patches/03-vmxnet.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03-vmxnet.patch	2010-07-19 23:13:47 +0000
@@ -0,0 +1,27 @@
+$  diff -u vmxnet.c~ vmxnet.c
+--- open-vm-tools.orig/modules/linux/vmxnet/vmxnet.c~	2010-05-31 18:13:50.000000000 -0400
++++ open-vm-tools/modules/linux/vmxnet/vmxnet.c	2010-06-25 12:20:36.398921999 -0400
+@@ -2910,7 +2910,7 @@
+ {
+    struct Vmxnet_Private *lp = netdev_priv(dev);
+     volatile u16 *mcast_table = (u16 *)lp->dd->LADRF;
+-    struct dev_mc_list *dmi = dev->mc_list;
++    struct netdev_hw_addr *ha;  // struct dev_mc_list *dmi = dev->mc_list;
+     u8 *addrs;
+     int i, j, bit, byte;
+     u32 crc, poly = CRC_POLYNOMIAL_LE;
+@@ -2919,10 +2919,11 @@
+     lp->dd->LADRF[0] = 0;
+     lp->dd->LADRF[1] = 0;
+ 
++    i = 0;
+     /* Add addresses */
+-    for (i = 0; i < dev->mc_count; i++){
+-	addrs = dmi->dmi_addr;
+-	dmi   = dmi->next;
++    netdev_for_each_mc_addr(ha, dev) { // for (i = 0; i < dev->mc_count; i++){
++        addrs = ha->addr; //dmi->dmi_addr;
++	++i; // dmi   = dmi->next;
+ 
+ 	/* multicast address? */
+ 	if (!(*addrs & 1))

=== added file 'debian/patches/04-vsock.patch'
--- debian/patches/04-vsock.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04-vsock.patch	2010-07-19 23:13:47 +0000
@@ -0,0 +1,119 @@
+--- open-vm-tools.orig/modules/linux/vsock/linux/af_vsock.c.orig	2010-05-31 18:13:50.000000000 -0400
++++ open-vm-tools/modules/linux/vsock/linux/af_vsock.c	2010-06-25 11:42:23.248921999 -0400
+@@ -3472,7 +3472,7 @@
+     * a notification of an error.
+     */
+    timeout = sock_sndtimeo(sk, flags & O_NONBLOCK);
+-   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+ 
+    while (sk->compat_sk_state != SS_CONNECTED && sk->compat_sk_err == 0) {
+       if (timeout == 0) {
+@@ -3495,7 +3495,7 @@
+          goto outWaitError;
+       }
+ 
+-      compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++      compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+    }
+ 
+    if (sk->compat_sk_err) {
+@@ -3507,7 +3507,7 @@
+    }
+ 
+ outWait:
+-   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
+ out:
+    release_sock(sk);
+    return err;
+@@ -3567,7 +3567,7 @@
+     * upon connection establishment.
+     */
+    timeout = sock_sndtimeo(listener, flags & O_NONBLOCK);
+-   compat_init_prepare_to_wait(listener->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(listener), &wait, TASK_INTERRUPTIBLE);
+ 
+    while ((connected = VSockVmciDequeueAccept(listener)) == NULL &&
+           listener->compat_sk_err == 0) {
+@@ -3583,7 +3583,7 @@
+          goto outWait;
+       }
+ 
+-      compat_cont_prepare_to_wait(listener->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++      compat_cont_prepare_to_wait(compat_sk_sleep(listener), &wait, TASK_INTERRUPTIBLE);
+    }
+ 
+    if (listener->compat_sk_err) {
+@@ -3617,7 +3617,7 @@
+    }
+ 
+ outWait:
+-   compat_finish_wait(listener->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(listener), &wait, TASK_RUNNING);
+ out:
+    release_sock(listener);
+    return err;
+@@ -3715,7 +3715,7 @@
+    sk = sock->sk;
+    vsk = vsock_sk(sk);
+ 
+-   poll_wait(file, sk->compat_sk_sleep, wait);
++   poll_wait(file, compat_sk_sleep(sk), wait);
+    mask = 0;
+ 
+    if (sk->compat_sk_err) {
+@@ -4314,7 +4314,7 @@
+       goto out;
+    }
+ 
+-   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+ 
+    while (totalWritten < len) {
+       Bool sentWrote;
+@@ -4352,7 +4352,7 @@
+             goto outWait;
+          }
+ 
+-         compat_cont_prepare_to_wait(sk->compat_sk_sleep,
++         compat_cont_prepare_to_wait(compat_sk_sleep(sk),
+                                      &wait, TASK_INTERRUPTIBLE);
+       }
+ 
+@@ -4404,7 +4404,7 @@
+    if (totalWritten > 0) {
+       err = totalWritten;
+    }
+-   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
+ out:
+    release_sock(sk);
+    return err;
+@@ -4590,7 +4590,7 @@
+       goto out;
+    }
+ 
+-   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+ 
+    while ((ready = VSockVmciStreamHasData(vsk)) < target &&
+           sk->compat_sk_err == 0 &&
+@@ -4630,7 +4630,7 @@
+          goto outWait;
+       }
+ 
+-      compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++      compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+    }
+ 
+    if (sk->compat_sk_err) {
+@@ -4694,7 +4694,7 @@
+    err = copied;
+ 
+ outWait:
+-   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
+ out:
+    release_sock(sk);
+    return err;

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-06-01 17:13:07 +0000
+++ debian/patches/series	2010-07-19 23:13:47 +0000
@@ -1,2 +1,4 @@
 01-kvers.patch
 02-procps.patch
+03-vmxnet.patch
+04-vsock.patch