Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / cxgb3 / cxio_hal.c

diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c
index 1518b41482ae017467faab19246805da98033414..03c5ff62889a25c60b01e54afcefc44f89c503de 100644 (file)
--- a/drivers/infiniband/hw/cxgb3/cxio_hal.c
+++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c
@@ -37,6 +37,7 @@
 #include <linux/spinlock.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
+#include <net/net_namespace.h>
 
 #include "cxio_resource.h"
 #include "cxio_hal.h"
@@ -178,7 +179,7 @@ int cxio_create_cq(struct cxio_rdev *rdev_p, struct t3_cq *cq)
        setup.size = 1UL << cq->size_log2;
        setup.credits = 65535;
        setup.credit_thres = 1;
-       if (rdev_p->t3cdev_p->type == T3B)
+       if (rdev_p->t3cdev_p->type != T3A)
                setup.ovfl_mode = 0;
        else
                setup.ovfl_mode = 1;
@@ -583,7 +584,7 @@ static int cxio_hal_ctrl_qp_write_mem(struct cxio_rdev *rdev_p, u32 addr,
 {
        u32 i, nr_wqe, copy_len;
        u8 *copy_data;
-       u8 wr_len, utx_len;     /* lenght in 8 byte flit */
+       u8 wr_len, utx_len;     /* length in 8 byte flit */
        enum t3_wr_flags flag;
        __be64 *wqe;
        u64 utx_cmd;
@@ -894,7 +895,7 @@ int cxio_rdev_open(struct cxio_rdev *rdev_p)
                if (cxio_hal_find_rdev_by_name(rdev_p->dev_name)) {
                        return -EBUSY;
                }
-               netdev_p = dev_get_by_name(rdev_p->dev_name);
+               netdev_p = dev_get_by_name(&init_net, rdev_p->dev_name);
                if (!netdev_p) {
                        return -EINVAL;
                }
@@ -916,7 +917,7 @@ int cxio_rdev_open(struct cxio_rdev *rdev_p)
        PDBG("%s opening rnic dev %s\n", __FUNCTION__, rdev_p->dev_name);
        memset(&rdev_p->ctrl_qp, 0, sizeof(rdev_p->ctrl_qp));
        if (!rdev_p->t3cdev_p)
-               rdev_p->t3cdev_p = T3CDEV(netdev_p);
+               rdev_p->t3cdev_p = dev2t3cdev(netdev_p);
        rdev_p->t3cdev_p->ulp = (void *) rdev_p;
        err = rdev_p->t3cdev_p->ctl(rdev_p->t3cdev_p, RDMA_GET_PARAMS,
                                         &(rdev_p->rnic_info));