]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
IB/ipath: Remove redundant link state checks
authorRalph Campbell <ralph.campbell@qlogic.com>
Fri, 5 Oct 2007 23:03:21 +0000 (16:03 -0700)
committerRoland Dreier <rolandd@cisco.com>
Wed, 10 Oct 2007 04:02:08 +0000 (21:02 -0700)
This patch removes some redundant checks when the SMA changes the link
state since the same checks are made in the lower level function that
sets the state.

Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
drivers/infiniband/hw/ipath/ipath_mad.c

index 0ae3a7c3f86ecc87d873a880bd79fd566445ce09..3d1432d1e3f40dbe7a3da11e7dbde429c21c7e19 100644 (file)
@@ -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: