From: Yuval Shaia Date: Thu, 5 May 2016 07:47:48 +0000 (-0700) Subject: net/rds: Use max_mr from HCA caps than max_fmr X-Git-Tag: v4.1.12-92~159^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5dd95f3a123843124bbdb4c44c0ee8c7781da28a;p=users%2Fjedix%2Flinux-maple.git net/rds: Use max_mr from HCA caps than max_fmr All HCA drivers seems to populate max_mr caps and few of them do both max_mr and max_fmr. Hence update RDS code to make use of max_mr. Orabug: 23223564 Signed-off-by: Santosh Shilimkar Signed-off-by: Santosh Shilimkar Signed-off-by: Yuval Shaia --- diff --git a/net/rds/ib.c b/net/rds/ib.c index fb232b1f49e8..e1f7a749d15e 100644 --- a/net/rds/ib.c +++ b/net/rds/ib.c @@ -2155,13 +2155,13 @@ void rds_ib_add_one(struct ib_device *device) rds_ibdev->fmr_max_remaps = dev_attr->max_map_per_fmr?: 32; - rds_ibdev->max_1m_fmrs = dev_attr->max_fmr ? - min_t(unsigned int, dev_attr->max_fmr, + rds_ibdev->max_1m_fmrs = dev_attr->max_mr ? + min_t(unsigned int, dev_attr->max_mr, rds_ib_fmr_1m_pool_size) : rds_ib_fmr_1m_pool_size; - rds_ibdev->max_8k_fmrs = dev_attr->max_fmr ? - min_t(unsigned int, dev_attr->max_fmr, + rds_ibdev->max_8k_fmrs = dev_attr->max_mr ? + min_t(unsigned int, dev_attr->max_mr, rds_ib_fmr_8k_pool_size) : rds_ib_fmr_8k_pool_size;