Merge branch 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[pandora-kernel.git] / drivers / infiniband / hw / cxgb3 / iwch.c

diff --git a/drivers/infiniband/hw/cxgb3/iwch.c b/drivers/infiniband/hw/cxgb3/iwch.c
index 0315c9d..4489c89 100644 (file)
--- a/drivers/infiniband/hw/cxgb3/iwch.c
+++ b/drivers/infiniband/hw/cxgb3/iwch.c
@@ -65,24 +65,23 @@ static DEFINE_MUTEX(dev_mutex);
 
 static void rnic_init(struct iwch_dev *rnicp)
 {
-       PDBG("%s iwch_dev %p\n", __FUNCTION__,  rnicp);
+       PDBG("%s iwch_dev %p\n", __func__,  rnicp);
        idr_init(&rnicp->cqidr);
        idr_init(&rnicp->qpidr);
        idr_init(&rnicp->mmidr);
        spin_lock_init(&rnicp->lock);
 
-       rnicp->attr.vendor_id = 0x168;
-       rnicp->attr.vendor_part_id = 7;
        rnicp->attr.max_qps = T3_MAX_NUM_QP - 32;
-       rnicp->attr.max_wrs = (1UL << 24) - 1;
+       rnicp->attr.max_wrs = T3_MAX_QP_DEPTH;
        rnicp->attr.max_sge_per_wr = T3_MAX_SGE;
        rnicp->attr.max_sge_per_rdma_write_wr = T3_MAX_SGE;
        rnicp->attr.max_cqs = T3_MAX_NUM_CQ - 1;
-       rnicp->attr.max_cqes_per_cq = (1UL << 24) - 1;
+       rnicp->attr.max_cqes_per_cq = T3_MAX_CQ_DEPTH;
        rnicp->attr.max_mem_regs = cxio_num_stags(&rnicp->rdev);
        rnicp->attr.max_phys_buf_entries = T3_MAX_PBL_SIZE;
        rnicp->attr.max_pds = T3_MAX_NUM_PD - 1;
-       rnicp->attr.mem_pgsizes_bitmask = 0x7FFF;       /* 4KB-128MB */
+       rnicp->attr.mem_pgsizes_bitmask = T3_PAGESIZE_MASK;
+       rnicp->attr.max_mr_size = T3_MAX_MR_SIZE;
        rnicp->attr.can_resize_wq = 0;
        rnicp->attr.max_rdma_reads_per_qp = 8;
        rnicp->attr.max_rdma_read_resources =
@@ -106,7 +105,7 @@ static void open_rnic_dev(struct t3cdev *tdev)
        struct iwch_dev *rnicp;
        static int vers_printed;
 
-       PDBG("%s t3cdev %p\n", __FUNCTION__,  tdev);
+       PDBG("%s t3cdev %p\n", __func__,  tdev);
        if (!vers_printed++)
                printk(KERN_INFO MOD "Chelsio T3 RDMA Driver - version %s\n",
                       DRV_VERSION);
@@ -144,7 +143,7 @@ static void open_rnic_dev(struct t3cdev *tdev)
 static void close_rnic_dev(struct t3cdev *tdev)
 {
        struct iwch_dev *dev, *tmp;
-       PDBG("%s t3cdev %p\n", __FUNCTION__,  tdev);
+       PDBG("%s t3cdev %p\n", __func__,  tdev);
        mutex_lock(&dev_mutex);
        list_for_each_entry_safe(dev, tmp, &dev_list, entry) {
                if (dev->rdev.t3cdev_p == tdev) {