6 files changed, 35 insertions, 27 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 3b77b674cbf6..c7b8a506af65 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -955,7 +955,7 @@ void ehca_poll_eqs(unsigned long data)
                         struct ehca_eq *eq = &shca->eq;
                         int max = 3;
                         volatile u64 q_ofs, q_ofs2;
-                        u64 flags;
+                        unsigned long flags;
                         spin_lock_irqsave(&eq->spinlock, flags);
                         q_ofs = eq->ipz_queue.current_q_offset;
                         spin_unlock_irqrestore(&eq->spinlock, flags);
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index dcefe1fceb5c..61588bd273bd 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -543,14 +543,21 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
 {
         static int mlx4_ib_version_printed;
         struct mlx4_ib_dev *ibdev;
+        int num_ports = 0;
         int i;
 
-
         if (!mlx4_ib_version_printed) {
                 printk(KERN_INFO "%s", mlx4_ib_version);
                 ++mlx4_ib_version_printed;
         }
 
+        mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_IB)
+                num_ports++;
+
+        /* No point in registering a device with no ports... */
+        if (num_ports == 0)
+                return NULL;
+
         ibdev = (struct mlx4_ib_dev *) ib_alloc_device(sizeof *ibdev);
         if (!ibdev) {
                 dev_err(&dev->pdev->dev, "Device struct alloc failed\n");
@@ -574,9 +581,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
         ibdev->ib_dev.owner             = THIS_MODULE;
         ibdev->ib_dev.node_type         = RDMA_NODE_IB_CA;
         ibdev->ib_dev.local_dma_lkey    = dev->caps.reserved_lkey;
-        ibdev->num_ports = 0;
-        mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_IB)
-                ibdev->num_ports++;
+        ibdev->num_ports                = num_ports;
         ibdev->ib_dev.phys_port_cnt     = ibdev->num_ports;
         ibdev->ib_dev.num_comp_vectors  = dev->caps.num_comp_vectors;
         ibdev->ib_dev.dma_device        = &dev->pdev->dev;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 19e06bc38b39..dce0443f9d69 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -711,26 +711,26 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
                 neigh = *to_ipoib_neigh(skb->dst->neighbour);
 
-                if (neigh->ah)
-                        if (unlikely((memcmp(&neigh->dgid.raw,
-                                            skb->dst->neighbour->ha + 4,
-                                            sizeof(union ib_gid))) ||
-                                         (neigh->dev != dev))) {
-                                spin_lock_irqsave(&priv->lock, flags);
-                                /*
-                                 * It's safe to call ipoib_put_ah() inside
-                                 * priv->lock here, because we know that
-                                 * path->ah will always hold one more reference,
-                                 * so ipoib_put_ah() will never do more than
-                                 * decrement the ref count.
-                                 */
+                if (unlikely((memcmp(&neigh->dgid.raw,
+                                     skb->dst->neighbour->ha + 4,
+                                     sizeof(union ib_gid))) ||
+                             (neigh->dev != dev))) {
+                        spin_lock_irqsave(&priv->lock, flags);
+                        /*
+                         * It's safe to call ipoib_put_ah() inside
+                         * priv->lock here, because we know that
+                         * path->ah will always hold one more reference,
+                         * so ipoib_put_ah() will never do more than
+                         * decrement the ref count.
+                         */
+                        if (neigh->ah)
                                 ipoib_put_ah(neigh->ah);
-                                list_del(&neigh->list);
-                                ipoib_neigh_free(dev, neigh);
-                                spin_unlock_irqrestore(&priv->lock, flags);
-                                ipoib_path_lookup(skb, dev);
-                                return NETDEV_TX_OK;
-                        }
+                        list_del(&neigh->list);
+                        ipoib_neigh_free(dev, neigh);
+                        spin_unlock_irqrestore(&priv->lock, flags);
+                        ipoib_path_lookup(skb, dev);
+                        return NETDEV_TX_OK;
+                }
 
                 if (ipoib_cm_get(neigh)) {
                         if (ipoib_cm_up(neigh)) {
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index a2eb3b9789eb..59d02e0b8df1 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -529,6 +529,9 @@ void ipoib_mcast_join_task(struct work_struct *work)
         if (!priv->broadcast) {
                 struct ipoib_mcast *broadcast;
 
+                if (!test_bit(IPOIB_FLAG_ADMIN_UP, &priv->flags))
+                        return;
+
                 broadcast = ipoib_mcast_alloc(dev, 1);
                 if (!broadcast) {
                         ipoib_warn(priv, "failed to allocate broadcast group\n");
diff --git a/drivers/infiniband/ulp/iser/Kconfig b/drivers/infiniband/ulp/iser/Kconfig
index 77dedba829e6..b411c51842da 100644
--- a/drivers/infiniband/ulp/iser/Kconfig
+++ b/drivers/infiniband/ulp/iser/Kconfig
@@ -1,6 +1,6 @@
 config INFINIBAND_ISER
         tristate "iSCSI Extensions for RDMA (iSER)"
-        depends on SCSI && INET
+        depends on SCSI && INET && INFINIBAND_ADDR_TRANS
         select SCSI_ISCSI_ATTRS
         ---help---
           Support for the iSCSI Extensions for RDMA (iSER) Protocol
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 710c79e7a2db..6ef2490d5c3e 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -912,8 +912,8 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
         int i;
 
         if (msi_x) {
-                nreq = min(dev->caps.num_eqs - dev->caps.reserved_eqs,
-                           num_possible_cpus() + 1);
+                nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs,
+                             num_possible_cpus() + 1);
                 entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);
                 if (!entries)
                         goto no_msi;