From 15eb066ce1b8c97a57d47240525be3b3b9737159 Mon Sep 17 00:00:00 2001 From: Mike Marciniszyn Date: Mon, 10 Jan 2011 17:42:20 -0800 Subject: [PATCH] --- yaml --- r: 229265 b: refs/heads/master c: b3d5cb2f2067b30da53aa67e42fdd733030fb411 h: refs/heads/master i: 229263: 0ae106e332276bdcdbfe84b691905985f1828f8c v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/qib/qib_intr.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index eba4f1ed1f1e..e6f40d936608 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7665e5a6988450a6cc19c2dc1dff4d290077614 +refs/heads/master: b3d5cb2f2067b30da53aa67e42fdd733030fb411 diff --git a/trunk/drivers/infiniband/hw/qib/qib_intr.c b/trunk/drivers/infiniband/hw/qib/qib_intr.c index 54a40828a106..a693c56ec8a6 100644 --- a/trunk/drivers/infiniband/hw/qib/qib_intr.c +++ b/trunk/drivers/infiniband/hw/qib/qib_intr.c @@ -131,7 +131,8 @@ void qib_handle_e_ibstatuschanged(struct qib_pportdata *ppd, u64 ibcs) /* start a 75msec timer to clear symbol errors */ mod_timer(&ppd->symerr_clear_timer, msecs_to_jiffies(75)); - } else if (ltstate == IB_PHYSPORTSTATE_LINKUP) { + } else if (ltstate == IB_PHYSPORTSTATE_LINKUP && + !(ppd->lflags & QIBL_LINKACTIVE)) { /* active, but not active defered */ qib_hol_up(ppd); /* useful only for 6120 now */ *ppd->statusp |=