Merge branch 'linus' into cpus4096

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

diff --git a/drivers/infiniband/hw/cxgb3/iwch.h b/drivers/infiniband/hw/cxgb3/iwch.h
index caf4e60..3773453 100644 (file)
--- a/drivers/infiniband/hw/cxgb3/iwch.h
+++ b/drivers/infiniband/hw/cxgb3/iwch.h
@@ -48,8 +48,6 @@ struct iwch_qp;
 struct iwch_mr;
 
 struct iwch_rnic_attributes {
-       u32 vendor_id;
-       u32 vendor_part_id;
        u32 max_qps;
        u32 max_wrs;                            /* Max for any SQ/RQ */
        u32 max_sge_per_wr;
@@ -66,6 +64,7 @@ struct iwch_rnic_attributes {
         * size (4k)^i.  Phys block list mode unsupported.
         */
        u32 mem_pgsizes_bitmask;
+       u64 max_mr_size;
        u8 can_resize_wq;
 
        /*
@@ -147,7 +146,7 @@ static inline int insert_handle(struct iwch_dev *rhp, struct idr *idr,
                                void *handle, u32 id)
 {
        int ret;
-       u32 newid;
+       int newid;
 
        do {
                if (!idr_pre_get(idr, GFP_KERNEL)) {