From 6328f5cd4d72a1e768deafe0460cd475239ef344 Mon Sep 17 00:00:00 2001 From: Joachim Fenkes Date: Tue, 22 Jul 2008 14:18:08 -0700 Subject: [PATCH] --- yaml --- r: 105643 b: refs/heads/master c: 593e4d4a05c8263a6dbd5452c21d47c5bdadd40c h: refs/heads/master i: 105641: 7f8a32e80b15eba8098f2ed3c782fb919b857e02 105639: 71ee7ea24f96626f4a441fa9af36ce53307cc5b5 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ehca/ehca_hca.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 358f152e4f20..6472cd198ea5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b673b71c8ca0fbdb99dc1b1434cfb554212d6ff +refs/heads/master: 593e4d4a05c8263a6dbd5452c21d47c5bdadd40c diff --git a/trunk/drivers/infiniband/hw/ehca/ehca_hca.c b/trunk/drivers/infiniband/hw/ehca/ehca_hca.c index bc3b37d2070f..46288220cfbb 100644 --- a/trunk/drivers/infiniband/hw/ehca/ehca_hca.c +++ b/trunk/drivers/infiniband/hw/ehca/ehca_hca.c @@ -114,7 +114,9 @@ int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props) } props->max_pkeys = 16; - props->local_ca_ack_delay = min_t(u8, rblock->local_ca_ack_delay, 255); + /* Some FW versions say 0 here; insert sensible value in that case */ + props->local_ca_ack_delay = rblock->local_ca_ack_delay ? + min_t(u8, rblock->local_ca_ack_delay, 255) : 12; props->max_raw_ipv6_qp = limit_uint(rblock->max_raw_ipv6_qp); props->max_raw_ethy_qp = limit_uint(rblock->max_raw_ethy_qp); props->max_mcast_grp = limit_uint(rblock->max_mcast_grp);