Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422771AbWHYSZr (ORCPT ); Fri, 25 Aug 2006 14:25:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1422777AbWHYSZj (ORCPT ); Fri, 25 Aug 2006 14:25:39 -0400 Received: from mx.pathscale.com ([64.160.42.68]:44674 "EHLO mx.pathscale.com") by vger.kernel.org with ESMTP id S1422771AbWHYSZT (ORCPT ); Fri, 25 Aug 2006 14:25:19 -0400 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 17 of 23] IB/ipath - validate path_mig_state properly X-Mercurial-Node: 98402de144a44d8589372c01aea52aba8dc0f1b7 Message-Id: <98402de144a44d858937.1156530282@eng-12.pathscale.com> In-Reply-To: Date: Fri, 25 Aug 2006 11:24:42 -0700 From: "Bryan O'Sullivan" To: rdreier@cisco.com Cc: openib-general@openib.org, linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 856 Lines: 20 Signed-off-by: Bryan O'Sullivan diff --git a/drivers/infiniband/hw/ipath/ipath_qp.c b/drivers/infiniband/hw/ipath/ipath_qp.c --- a/drivers/infiniband/hw/ipath/ipath_qp.c Fri Aug 25 11:19:45 2006 -0700 +++ b/drivers/infiniband/hw/ipath/ipath_qp.c Fri Aug 25 11:19:45 2006 -0700 @@ -491,7 +491,8 @@ int ipath_modify_qp(struct ib_qp *ibqp, goto inval; if (attr_mask & IB_QP_PATH_MIG_STATE) - if (attr->path_mig_state != IB_MIG_MIGRATED) + if (attr->path_mig_state != IB_MIG_MIGRATED && + attr->path_mig_state != IB_MIG_REARM) goto inval; switch (new_state) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/