Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 3 insertions, 0 deletions

diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
index a416b0d492b1..3e9460f935d8 100644
--- a/net/rds/iw_cm.c
+++ b/net/rds/iw_cm.c
@@ -32,6 +32,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/in.h>
+#include <linux/slab.h>
 #include <linux/vmalloc.h>
 
 #include "rds.h"
@@ -696,6 +697,8 @@ int rds_iw_conn_alloc(struct rds_connection *conn, gfp_t gfp)
                 return -ENOMEM;
 
         INIT_LIST_HEAD(&ic->iw_node);
+        tasklet_init(&ic->i_recv_tasklet, rds_iw_recv_tasklet_fn,
+                     (unsigned long) ic);
         mutex_init(&ic->i_recv_mutex);
 #ifndef KERNEL_HAS_ATOMIC64
         spin_lock_init(&ic->i_ack_lock);