From 9e1bfc24c95262e6827218a74cc5b1b35f4e4b94 Mon Sep 17 00:00:00 2001 From: Arthur Jones Date: Tue, 18 Sep 2007 14:24:23 -0700 Subject: [PATCH] --- yaml --- r: 67161 b: refs/heads/master c: 4bec0b9155d6757847b754e21b55ecafcecef839 h: refs/heads/master i: 67159: 3e3624ad6b93ac1c5d46d716b05ae84c83a90c88 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ipath/ipath_iba6110.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1ddcbfe03330..dcb295c05f8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70c51da2c4f84317bb13a2b564600afdcebd686f +refs/heads/master: 4bec0b9155d6757847b754e21b55ecafcecef839 diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_iba6110.c b/trunk/drivers/infiniband/hw/ipath/ipath_iba6110.c index e1c5998887ea..d4940beb58c7 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_iba6110.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_iba6110.c @@ -1599,8 +1599,10 @@ static int ipath_ht_get_base_info(struct ipath_portdata *pd, void *kbase) { struct ipath_base_info *kinfo = kbase; - kinfo->spi_runtime_flags |= IPATH_RUNTIME_HT | - IPATH_RUNTIME_RCVHDR_COPY; + kinfo->spi_runtime_flags |= IPATH_RUNTIME_HT; + + if (pd->port_dd->ipath_minrev < 4) + kinfo->spi_runtime_flags |= IPATH_RUNTIME_RCVHDR_COPY; return 0; }