From patchwork Tue Jan 22 16:42:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Domke X-Patchwork-Id: 2019411 X-Patchwork-Delegate: alexne@voltaire.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 62D5D3FD1A for ; Tue, 22 Jan 2013 16:47:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754822Ab3AVQry (ORCPT ); Tue, 22 Jan 2013 11:47:54 -0500 Received: from mail03.nap.gsic.titech.ac.jp ([131.112.13.22]:58648 "HELO mail03.nap.gsic.titech.ac.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753890Ab3AVQrx (ORCPT ); Tue, 22 Jan 2013 11:47:53 -0500 Received: from 131.112.13.36 by mail03.nap.gsic.titech.ac.jp with Mail2000 ESMTP Server V6.00S(15874:0:AUTH_RELAY) (envelope-from ); Wed, 23 Jan 2013 01:42:21 +0900 (JST) Received: from [131.112.13.20] (mail01.nap.gsic.titech.ac.jp) by drweb1.nap.gsic.titech.ac.jp (Dr.Web MailD 6.0.2.0) with SMTP id 0167C4FC; Wed, 23 Jan 2013 01:42:21 Received: from 131.112.29.201 by mail01.nap.gsic.titech.ac.jp with Mail2000 ESMTP Server V6.00S(793:0:AUTH_LOGIN) (envelope-from ); Wed, 23 Jan 2013 01:42:20 +0900 (JST) From: Jens Domke To: linux-rdma@vger.kernel.org Cc: Alex Netes , Torsten Hoefler , Jens Domke Subject: [PATCH 10/10] OpenSM: dfsssp - moved paths from one to another VL might be counted multiple times Date: Wed, 23 Jan 2013 01:42:04 +0900 Message-Id: <1358872924-17101-1-git-send-email-domke.j.aa@m.titech.ac.jp> X-Mailer: git-send-email 1.7.1 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org the counter for paths, which have been moved to a different VL, was incorrect; the counter should not include paths moved in a previous step Signed-off-by: Jens Domke --- opensm/osm_ucast_dfsssp.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/opensm/osm_ucast_dfsssp.c b/opensm/osm_ucast_dfsssp.c index c8a1007..a53e783 100644 --- a/opensm/osm_ucast_dfsssp.c +++ b/opensm/osm_ucast_dfsssp.c @@ -1813,8 +1813,14 @@ static int dfsssp_remove_deadlocks(dfsssp_context_t * dfsssp_ctx) (uint8_t) vltable_get_vl(srcdest2vl_table, cl_hton16(slid), - cl_hton16(dlid))) + cl_hton16(dlid))) { + /* this path has been moved + before -> don't count + */ + paths_per_vl[test_vl]++; + paths_per_vl[test_vl + 1]--; continue; + } src_port = osm_get_port_by_lid(p_mgr->p_subn,