From patchwork Sun Mar 23 20:18:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hefty, Sean" X-Patchwork-Id: 3880671 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C3D7DBF549 for ; Sun, 23 Mar 2014 20:18:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE54F20259 for ; Sun, 23 Mar 2014 20:18:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC3432020F for ; Sun, 23 Mar 2014 20:18:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751079AbaCWUSq (ORCPT ); Sun, 23 Mar 2014 16:18:46 -0400 Received: from mga11.intel.com ([192.55.52.93]:10324 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751231AbaCWUSe (ORCPT ); Sun, 23 Mar 2014 16:18:34 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 23 Mar 2014 13:18:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,715,1389772800"; d="scan'208";a="505038313" Received: from cst-linux.jf.intel.com ([10.23.221.72]) by fmsmga002.fm.intel.com with ESMTP; 23 Mar 2014 13:18:33 -0700 From: sean.hefty@intel.com To: sean.hefty@intel.com, ira.weiny@intel.com, kaike.wan@intel.com, john.fleck@intel.com, linux-rdma@vger.kernel.org Subject: [PATCH 9/9] ibacm: Restructure acm_port_join Date: Sun, 23 Mar 2014 13:18:21 -0700 Message-Id: <1395605901-9080-10-git-send-email-sean.hefty@intel.com> X-Mailer: git-send-email 1.7.3 In-Reply-To: <1395605901-9080-1-git-send-email-sean.hefty@intel.com> References: <1395605901-9080-1-git-send-email-sean.hefty@intel.com> 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=unavailable 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 From: Sean Hefty Create a subroutine to process joining a single endpoint that can be called directly in place of joining all endpoints on a port. This will make it easier to handle future changes that affect a single endpoint, such as a pkey change. Signed-off-by: Sean Hefty --- src/acm.c | 38 ++++++++++++++++++++++++-------------- 1 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/acm.c b/src/acm.c index 2d9ecee..14ef71a 100644 --- a/src/acm.c +++ b/src/acm.c @@ -1566,32 +1566,42 @@ out: free(umad); } +static void acm_ep_join(struct acm_ep *ep) +{ + struct acm_port *port; + + port = ep->port; + acm_log(1, "%s\n", ep->id_string); + + ep->mc_cnt = 0; + acm_join_group(ep, &port->base_gid, 0, 0, 0, min_rate, min_mtu); + + if ((ep->state = ep->mc_dest[0].state) != ACM_READY) + return; + + if ((route_prot == ACM_ROUTE_PROT_ACM) && + (port->rate != min_rate || port->mtu != min_mtu)) + acm_join_group(ep, &port->base_gid, 0, 0, 0, port->rate, port->mtu); + + acm_log(1, "join for %s complete\n", ep->id_string); +} + static void acm_port_join(struct acm_port *port) { - struct acm_device *dev; struct acm_ep *ep; DLIST_ENTRY *ep_entry; - dev = port->dev; - acm_log(1, "device %s port %d\n", dev->verbs->device->name, + acm_log(1, "device %s port %d\n", port->dev->verbs->device->name, port->port_num); for (ep_entry = port->ep_list.Next; ep_entry != &port->ep_list; ep_entry = ep_entry->Next) { ep = container_of(ep_entry, struct acm_ep, entry); - ep->mc_cnt = 0; - acm_join_group(ep, &port->base_gid, 0, 0, 0, min_rate, min_mtu); - - if ((ep->state = ep->mc_dest[0].state) != ACM_READY) - continue; - - if ((route_prot == ACM_ROUTE_PROT_ACM) && - (port->rate != min_rate || port->mtu != min_mtu)) - acm_join_group(ep, &port->base_gid, 0, 0, 0, port->rate, port->mtu); + acm_ep_join(ep); } - acm_log(1, "joins for device %s port %d complete\n", dev->verbs->device->name, - port->port_num); + acm_log(1, "joins for device %s port %d complete\n", + port->dev->verbs->device->name, port->port_num); } static void acm_process_timeouts(void)