From 0e31e5e9f3ff464ed657a12af4ed5c688d64887c Mon Sep 17 00:00:00 2001 From: Ralph Campbell Date: Fri, 6 Jul 2007 12:48:38 -0700 Subject: [PATCH] --- yaml --- r: 59335 b: refs/heads/master c: 37a7e9b7f28fbef4b6abda102fa41c1467f6022f h: refs/heads/master i: 59333: d43f6e81125cc44f968b69bbb2f4c27039f3916a 59331: 16541f1132241d286bebe998ba0bd1211f2f5590 59327: 522fc433665305947782bc5aa477fc5c8bb127d3 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 10ec148aee70..a73e37c3e7f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f42b6471e9e9082ed4bcba1456eccadf98f1337a +refs/heads/master: 37a7e9b7f28fbef4b6abda102fa41c1467f6022f diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c b/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c index 1b1af349f194..fa98aabdf76b 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c @@ -737,7 +737,7 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit) uports = dd->ipath_cfgports ? dd->ipath_cfgports - 1 : 0; if (ipath_kpiobufs == 0) { /* not set by user (this is default) */ - if (piobufs >= (uports * IPATH_MIN_USER_PORT_BUFCNT) + 32) + if (piobufs > 144) kpiobufs = 32; else kpiobufs = 16;