---

yaml
---
r: 67167
b: refs/heads/master
c: bda94e3
h: refs/heads/master
i:
  67165: f09b078
  67163: 8db809a
  67159: 3e3624a
  67151: 05f4f17
  67135: e536e70
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49739b3e24a10d819d3167a1c5b319d0b1186245
+refs/heads/master: bda94e32b39c0e60d43b34a175363601b6f12ca4

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: