Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	arch/x86/kernel/io_apic.c

5 files changed, 69 insertions, 34 deletions

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index a5dc78ae62d4..dd0db67bf8d7 100644
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -37,6 +37,7 @@ config INFINIBAND_USER_MEM
 config INFINIBAND_ADDR_TRANS
         bool
         depends on INET
+        depends on !(INFINIBAND = y && IPV6 = m)
         default y
 
 source "drivers/infiniband/hw/mthca/Kconfig"
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index d98b05b28262..ce511d8748ce 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -128,6 +128,8 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr)
                 ret = rdma_copy_addr(dev_addr, dev, NULL);
                 dev_put(dev);
                 break;
+
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         case AF_INET6:
                 for_each_netdev(&init_net, dev) {
                         if (ipv6_chk_addr(&init_net,
@@ -138,8 +140,7 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr)
                         }
                 }
                 break;
-        default:
-                break;
+#endif
         }
         return ret;
 }
@@ -179,10 +180,11 @@ static void addr_send_arp(struct sockaddr *dst_in)
 {
         struct rtable *rt;
         struct flowi fl;
-        struct dst_entry *dst;
 
         memset(&fl, 0, sizeof fl);
-        if (dst_in->sa_family == AF_INET)  {
+
+        switch (dst_in->sa_family) {
+        case AF_INET:
                 fl.nl_u.ip4_u.daddr =
                         ((struct sockaddr_in *) dst_in)->sin_addr.s_addr;
 
@@ -191,8 +193,13 @@ static void addr_send_arp(struct sockaddr *dst_in)
 
                 neigh_event_send(rt->u.dst.neighbour, NULL);
                 ip_rt_put(rt);
+                break;
+
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        case AF_INET6:
+        {
+                struct dst_entry *dst;
 
-        } else {
                 fl.nl_u.ip6_u.daddr =
                         ((struct sockaddr_in6 *) dst_in)->sin6_addr;
 
@@ -202,6 +209,9 @@ static void addr_send_arp(struct sockaddr *dst_in)
 
                 neigh_event_send(dst->neighbour, NULL);
                 dst_release(dst);
+                break;
+        }
+#endif
         }
 }
 
@@ -254,6 +264,7 @@ out:
         return ret;
 }
 
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 static int addr6_resolve_remote(struct sockaddr_in6 *src_in,
                                struct sockaddr_in6 *dst_in,
                                struct rdma_dev_addr *addr)
@@ -282,6 +293,14 @@ static int addr6_resolve_remote(struct sockaddr_in6 *src_in,
         dst_release(dst);
         return ret;
 }
+#else
+static int addr6_resolve_remote(struct sockaddr_in6 *src_in,
+                               struct sockaddr_in6 *dst_in,
+                               struct rdma_dev_addr *addr)
+{
+        return -EADDRNOTAVAIL;
+}
+#endif
 
 static int addr_resolve_remote(struct sockaddr *src_in,
                                 struct sockaddr *dst_in,
@@ -340,7 +359,9 @@ static int addr_resolve_local(struct sockaddr *src_in,
         struct net_device *dev;
         int ret;
 
-        if (dst_in->sa_family == AF_INET) {
+        switch (dst_in->sa_family) {
+        case AF_INET:
+        {
                 __be32 src_ip = ((struct sockaddr_in *) src_in)->sin_addr.s_addr;
                 __be32 dst_ip = ((struct sockaddr_in *) dst_in)->sin_addr.s_addr;
 
@@ -362,7 +383,12 @@ static int addr_resolve_local(struct sockaddr *src_in,
                                 memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
                 }
                 dev_put(dev);
-        } else {
+                break;
+        }
+
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        case AF_INET6:
+        {
                 struct in6_addr *a;
 
                 for_each_netdev(&init_net, dev)
@@ -390,6 +416,13 @@ static int addr_resolve_local(struct sockaddr *src_in,
                         if (!ret)
                                 memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
                 }
+                break;
+        }
+#endif
+
+        default:
+                ret = -EADDRNOTAVAIL;
+                break;
         }
 
         return ret;
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index 8415ecce5c4c..a3c5af1d7ec0 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -699,7 +699,7 @@ repoll:
                 }
 
                 wc->slid           = be16_to_cpu(cqe->rlid);
-                wc->sl             = be16_to_cpu(cqe->sl_vid >> 12);
+                wc->sl             = be16_to_cpu(cqe->sl_vid) >> 12;
                 g_mlpath_rqpn      = be32_to_cpu(cqe->g_mlpath_rqpn);
                 wc->src_qp         = g_mlpath_rqpn & 0xffffff;
                 wc->dlid_path_bits = (g_mlpath_rqpn >> 24) & 0x7f;
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 1e5b6446231d..12876392516e 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -119,6 +119,14 @@ error:
         iscsi_conn_failure(conn, rc);
 }
 
+static int iscsi_iser_pdu_alloc(struct iscsi_task *task, uint8_t opcode)
+{
+        struct iscsi_iser_task *iser_task = task->dd_data;
+
+        task->hdr = (struct iscsi_hdr *)&iser_task->desc.iscsi_header;
+        task->hdr_max = sizeof(iser_task->desc.iscsi_header);
+        return 0;
+}
 
 /**
  * iscsi_iser_task_init - Initialize task
@@ -180,25 +188,26 @@ static int
 iscsi_iser_task_xmit_unsol_data(struct iscsi_conn *conn,
                                  struct iscsi_task *task)
 {
-        struct iscsi_data  hdr;
+        struct iscsi_r2t_info *r2t = &task->unsol_r2t;
+        struct iscsi_data hdr;
         int error = 0;
 
         /* Send data-out PDUs while there's still unsolicited data to send */
-        while (task->unsol_count > 0) {
-                iscsi_prep_unsolicit_data_pdu(task, &hdr);
+        while (iscsi_task_has_unsol_data(task)) {
+                iscsi_prep_data_out_pdu(task, r2t, &hdr);
                 debug_scsi("Sending data-out: itt 0x%x, data count %d\n",
-                           hdr.itt, task->data_count);
+                           hdr.itt, r2t->data_count);
 
                 /* the buffer description has been passed with the command */
                 /* Send the command */
                 error = iser_send_data_out(conn, task, &hdr);
                 if (error) {
-                        task->unsol_datasn--;
+                        r2t->datasn--;
                         goto iscsi_iser_task_xmit_unsol_data_exit;
                 }
-                task->unsol_count -= task->data_count;
+                r2t->sent += r2t->data_count;
                 debug_scsi("Need to send %d more as data-out PDUs\n",
-                           task->unsol_count);
+                           r2t->data_length - r2t->sent);
         }
 
 iscsi_iser_task_xmit_unsol_data_exit:
@@ -220,7 +229,7 @@ iscsi_iser_task_xmit(struct iscsi_task *task)
 
                 debug_scsi("cmd [itt %x total %d imm %d unsol_data %d\n",
                            task->itt, scsi_bufflen(task->sc),
-                           task->imm_count, task->unsol_count);
+                           task->imm_count, task->unsol_r2t.data_length);
         }
 
         debug_scsi("task deq [cid %d itt 0x%x]\n",
@@ -235,7 +244,7 @@ iscsi_iser_task_xmit(struct iscsi_task *task)
         }
 
         /* Send unsolicited data-out PDU(s) if necessary */
-        if (task->unsol_count)
+        if (iscsi_task_has_unsol_data(task))
                 error = iscsi_iser_task_xmit_unsol_data(conn, task);
 
  iscsi_iser_task_xmit_exit:
@@ -244,13 +253,15 @@ iscsi_iser_task_xmit(struct iscsi_task *task)
         return error;
 }
 
-static void
-iscsi_iser_cleanup_task(struct iscsi_conn *conn, struct iscsi_task *task)
+static void iscsi_iser_cleanup_task(struct iscsi_task *task)
 {
         struct iscsi_iser_task *iser_task = task->dd_data;
 
-        /* mgmt tasks do not need special cleanup */
-        if (!task->sc)
+        /*
+         * mgmt tasks do not need special cleanup and we do not
+         * allocate anything in the init task callout
+         */
+        if (!task->sc || task->state == ISCSI_TASK_PENDING)
                 return;
 
         if (iser_task->status == ISER_TASK_STATUS_STARTED) {
@@ -391,9 +402,6 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep,
         struct iscsi_cls_session *cls_session;
         struct iscsi_session *session;
         struct Scsi_Host *shost;
-        int i;
-        struct iscsi_task *task;
-        struct iscsi_iser_task *iser_task;
         struct iser_conn *ib_conn;
 
         shost = iscsi_host_alloc(&iscsi_iser_sht, 0, ISCSI_MAX_CMD_PER_LUN);
@@ -430,13 +438,6 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep,
         session = cls_session->dd_data;
 
         shost->can_queue = session->scsi_cmds_max;
-        /* libiscsi setup itts, data and pool so just set desc fields */
-        for (i = 0; i < session->cmds_max; i++) {
-                task = session->cmds[i];
-                iser_task = task->dd_data;
-                task->hdr = (struct iscsi_cmd *)&iser_task->desc.iscsi_header;
-                task->hdr_max = sizeof(iser_task->desc.iscsi_header);
-        }
         return cls_session;
 
 remove_host:
@@ -652,6 +653,7 @@ static struct iscsi_transport iscsi_iser_transport = {
         .init_task              = iscsi_iser_task_init,
         .xmit_task              = iscsi_iser_task_xmit,
         .cleanup_task           = iscsi_iser_cleanup_task,
+        .alloc_pdu              = iscsi_iser_pdu_alloc,
         /* recovery */
         .session_recovery_timedout = iscsi_session_recovery_timedout,
 
diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c
index ed1aff21b7ea..e209cb8dd948 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -353,8 +353,7 @@ int iser_send_command(struct iscsi_conn *conn,
         unsigned long edtl;
         int err = 0;
         struct iser_data_buf *data_buf;
-
-        struct iscsi_cmd *hdr =  task->hdr;
+        struct iscsi_cmd *hdr =  (struct iscsi_cmd *)task->hdr;
         struct scsi_cmnd *sc  =  task->sc;
 
         if (!iser_conn_state_comp(iser_conn->ib_conn, ISER_CONN_UP)) {
@@ -393,7 +392,7 @@ int iser_send_command(struct iscsi_conn *conn,
                 err = iser_prepare_write_cmd(task,
                                              task->imm_count,
                                              task->imm_count +
-                                             task->unsol_count,
+                                             task->unsol_r2t.data_length,
                                              edtl);
                 if (err)
                         goto send_command_error;