diff options
author | Tatyana Nikolova <Tatyana.E.Nikolova@intel.com> | 2012-10-02 16:40:33 +0000 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2012-10-03 14:27:58 -0700 |
commit | a67b078cf695a68b9b9ee8243a26ede1b5f714ba (patch) | |
tree | ccac45f46539b623eb192ea0fd7c8fd46397dc8b /drivers/infiniband | |
parent | d5fb476a10a9de56fb518886619ae9a6bf7c7efd (diff) | |
download | blackbird-op-linux-a67b078cf695a68b9b9ee8243a26ede1b5f714ba.tar.gz blackbird-op-linux-a67b078cf695a68b9b9ee8243a26ede1b5f714ba.zip |
RDMA/nes: Remove unnecessary if-else statement
Remove unnecessary if-else statement -- we do the same thing either way.
Signed-off-by: Tatyana Nikolova <Tatyana.E.Nikolova@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/hw/nes/nes_verbs.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c index 9eb54b7794fb..cd0ecb215cca 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.c +++ b/drivers/infiniband/hw/nes/nes_verbs.c @@ -3069,18 +3069,9 @@ int nes_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, } nesqp->ibqp_state = attr->qp_state; - if (((nesqp->iwarp_state & NES_CQP_QP_IWARP_STATE_MASK) == - (u32)NES_CQP_QP_IWARP_STATE_RTS) && - ((next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK) > - (u32)NES_CQP_QP_IWARP_STATE_RTS)) { - nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK; - nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n", - nesqp->iwarp_state); - } else { - nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK; - nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n", - nesqp->iwarp_state); - } + nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK; + nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n", + nesqp->iwarp_state); } if (attr_mask & IB_QP_ACCESS_FLAGS) { |