diff options
author | Tatyana Nikolova <Tatyana.E.Nikolova@intel.com> | 2012-10-02 12:40:33 -0400 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2012-10-03 17:27:58 -0400 |
commit | a67b078cf695a68b9b9ee8243a26ede1b5f714ba (patch) | |
tree | ccac45f46539b623eb192ea0fd7c8fd46397dc8b /drivers/infiniband | |
parent | d5fb476a10a9de56fb518886619ae9a6bf7c7efd (diff) |
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, | |||
3069 | } | 3069 | } |
3070 | 3070 | ||
3071 | nesqp->ibqp_state = attr->qp_state; | 3071 | nesqp->ibqp_state = attr->qp_state; |
3072 | if (((nesqp->iwarp_state & NES_CQP_QP_IWARP_STATE_MASK) == | 3072 | nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK; |
3073 | (u32)NES_CQP_QP_IWARP_STATE_RTS) && | 3073 | nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n", |
3074 | ((next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK) > | 3074 | nesqp->iwarp_state); |
3075 | (u32)NES_CQP_QP_IWARP_STATE_RTS)) { | ||
3076 | nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK; | ||
3077 | nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n", | ||
3078 | nesqp->iwarp_state); | ||
3079 | } else { | ||
3080 | nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK; | ||
3081 | nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n", | ||
3082 | nesqp->iwarp_state); | ||
3083 | } | ||
3084 | } | 3075 | } |
3085 | 3076 | ||
3086 | if (attr_mask & IB_QP_ACCESS_FLAGS) { | 3077 | if (attr_mask & IB_QP_ACCESS_FLAGS) { |