From patchwork Wed Feb 5 12:25:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Netes X-Patchwork-Id: 3586491 X-Patchwork-Delegate: hal@mellanox.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8993B9F392 for ; Wed, 5 Feb 2014 14:26:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2522201B4 for ; Wed, 5 Feb 2014 14:26:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF9DA20166 for ; Wed, 5 Feb 2014 14:26:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751159AbaBEO0e (ORCPT ); Wed, 5 Feb 2014 09:26:34 -0500 Received: from mail-ea0-f172.google.com ([209.85.215.172]:38336 "EHLO mail-ea0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750994AbaBEO0d (ORCPT ); Wed, 5 Feb 2014 09:26:33 -0500 Received: by mail-ea0-f172.google.com with SMTP id l9so222528eaj.17 for ; Wed, 05 Feb 2014 06:26:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=DorfUMEFNdfetiIV494okpz8hHIrvqaea6OgFVKYudU=; b=YERT7vHuWe3KqLAcvW2SWOoDbr+rt6AMxCANXon9PEBbw9MxMbpY5C27mbJJ7ipTzr 86xf0h+SkWrviXqZz8C0RlW29SjjHRO9nAVS4s3s3yHqKxqg2USXXrDJevZn/DhLU5X9 luMThvdOynJZDqFD+gq2tTa9qLYjyw0aUcy7y+4G8T9y+rr22uihvQxz82YNhNUTJhrJ 31f7mhSdaI9MkkED7mpRwN4r1MUhp88HEL9BSZ1AqteufkvVveFSq6kMoJiLOKHrdwf8 /v3Ch4FG3f3SxzVfjPXyxJS2pDuPrH7hyKF4Su0Ct9q3YM0lYC4/tHEIASBteGGZ8vbM I94A== X-Gm-Message-State: ALoCoQkk5mPQsq8p325NrBpCPxz8uJrl1qUxFUdVJYt+6nD80WjPZECnT7Z26e5hQ6wJ3k46/pen X-Received: by 10.15.42.136 with SMTP id u8mr2436867eev.52.1391610392414; Wed, 05 Feb 2014 06:26:32 -0800 (PST) Received: from localhost (out.voltaire.com. [193.47.165.251]) by mx.google.com with ESMTPSA id j42sm103703661eep.21.2014.02.05.06.26.30 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Wed, 05 Feb 2014 06:26:31 -0800 (PST) From: Alex Netes To: hal@mellanox.com, linux-rdma@vger.kernel.org Cc: Alex Netes Subject: [PATCH] opensm: Rename ib_switch_info_set_state_change function in ib_types.h Date: Wed, 5 Feb 2014 14:25:11 +0200 Message-Id: <1391603111-21633-1-git-send-email-alexne@mellanox.com> 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 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Function name collides with a function defined ibutils package. New name: ib_switch_info_state_change_set Signed-off-by: Alex Netes --- include/iba/ib_types.h | 6 +++--- opensm/osm_state_mgr.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/iba/ib_types.h b/include/iba/ib_types.h index 249ee16..a0bb31c 100644 --- a/include/iba/ib_types.h +++ b/include/iba/ib_types.h @@ -6507,9 +6507,9 @@ ib_switch_info_clear_state_change(IN ib_switch_info_t * const p_si) * SEE ALSO *********/ -/****f* IBA Base: Types/ib_switch_info_set_state_change +/****f* IBA Base: Types/ib_switch_info_state_change_set * NAME -* ib_switch_info_set_state_change +* ib_switch_info_state_change_set * * DESCRIPTION * Clears the switch's state change bit. @@ -6517,7 +6517,7 @@ ib_switch_info_clear_state_change(IN ib_switch_info_t * const p_si) * SYNOPSIS */ static inline void OSM_API -ib_switch_info_set_state_change(IN ib_switch_info_t * const p_si) +ib_switch_info_state_change_set(IN ib_switch_info_t * const p_si) { p_si->life_state = (uint8_t) ((p_si->life_state & ~IB_SWITCH_PSC) | IB_SWITCH_PSC); } diff --git a/opensm/osm_state_mgr.c b/opensm/osm_state_mgr.c index 5080b22..f9b20e2 100644 --- a/opensm/osm_state_mgr.c +++ b/opensm/osm_state_mgr.c @@ -559,7 +559,7 @@ static void state_mgr_reset_state_change_bit(IN cl_map_item_t * obj, si = p_sw->switch_info; - ib_switch_info_set_state_change(&si); + ib_switch_info_state_change_set(&si); OSM_LOG(sm->p_log, OSM_LOG_DEBUG, "Resetting PortStateChange on switch GUID 0x%016" PRIx64 "\n",