From 0dea77dce04650ba56d7b5dfa6d92068a4a8d096 Mon Sep 17 00:00:00 2001 From: Ralph Campbell Date: Fri, 5 Oct 2007 16:03:21 -0700 Subject: [PATCH] --- yaml --- r: 67167 b: refs/heads/master c: bda94e32b39c0e60d43b34a175363601b6f12ca4 h: refs/heads/master i: 67165: f09b07849cf1065949b6afa91f3919f7b3f57a82 67163: 8db809ac2af31457fdc85f284da2e89a1dffa54a 67159: 3e3624ad6b93ac1c5d46d716b05ae84c83a90c88 67151: 05f4f1754d56154d3ac1f24264ada965dc968b98 67135: e536e70cc79f3f0eaa59ec907bd9c4150b109f03 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ipath/ipath_mad.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 06ff112e03bd..d354e92da8ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49739b3e24a10d819d3167a1c5b319d0b1186245 +refs/heads/master: bda94e32b39c0e60d43b34a175363601b6f12ca4 diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_mad.c b/trunk/drivers/infiniband/hw/ipath/ipath_mad.c index 0ae3a7c3f86e..3d1432d1e3f4 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_mad.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_mad.c @@ -402,7 +402,6 @@ static int recv_subn_set_portinfo(struct ib_smp *smp, struct ib_event event; struct ipath_ibdev *dev; struct ipath_devdata *dd; - u32 flags; char clientrereg = 0; u16 lid, smlid; u8 lwe; @@ -541,7 +540,6 @@ static int recv_subn_set_portinfo(struct ib_smp *smp, * is down or is being set to down. */ state = pip->linkspeed_portstate & 0xF; - flags = dd->ipath_flags; lstate = (pip->portphysstate_linkdown >> 4) & 0xF; if (lstate && !(state == IB_PORT_DOWN || state == IB_PORT_NOP)) goto err; @@ -572,13 +570,9 @@ static int recv_subn_set_portinfo(struct ib_smp *smp, ipath_set_linkstate(dd, lstate); break; case IB_PORT_ARMED: - if (!(flags & (IPATH_LINKINIT | IPATH_LINKACTIVE))) - break; ipath_set_linkstate(dd, IPATH_IB_LINKARM); break; case IB_PORT_ACTIVE: - if (!(flags & IPATH_LINKARMED)) - break; ipath_set_linkstate(dd, IPATH_IB_LINKACTIVE); break; default: