From patchwork Fri Mar 28 05:49:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hefty, Sean" X-Patchwork-Id: 3900851 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 1B1D59F2E8 for ; Fri, 28 Mar 2014 05:50:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4A9CA202EC for ; Fri, 28 Mar 2014 05:50:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 48221202E6 for ; Fri, 28 Mar 2014 05:50:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751173AbaC1FuZ (ORCPT ); Fri, 28 Mar 2014 01:50:25 -0400 Received: from mga01.intel.com ([192.55.52.88]:3126 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751179AbaC1FuS (ORCPT ); Fri, 28 Mar 2014 01:50:18 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 27 Mar 2014 22:50:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,748,1389772800"; d="scan'208";a="501476345" Received: from cst-linux.jf.intel.com ([10.23.221.72]) by fmsmga001.fm.intel.com with ESMTP; 27 Mar 2014 22:50:16 -0700 From: sean.hefty@intel.com To: linux-rdma@vger.kernel.org Cc: Ira Weiny Subject: [PATCH 02/16] ibacm: pass interface name rather than 'struct ifreq' to get_devaddr, get_sgid, and get_pkey Date: Thu, 27 Mar 2014 22:49:56 -0700 Message-Id: <1395985810-23822-3-git-send-email-sean.hefty@intel.com> X-Mailer: git-send-email 1.7.3 In-Reply-To: <1395985810-23822-1-git-send-email-sean.hefty@intel.com> References: <1395985810-23822-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.3 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: Ira Weiny Signed-off-by: Ira Weiny --- linux/acme_linux.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/linux/acme_linux.c b/linux/acme_linux.c index 6978db7..201ff19 100644 --- a/linux/acme_linux.c +++ b/linux/acme_linux.c @@ -47,13 +47,13 @@ extern int verbose; static int -get_pkey(struct ifreq *ifreq, uint16_t *pkey) +get_pkey(char *ifname, uint16_t *pkey) { char buf[128], *end; FILE *f; int ret; - snprintf(buf, sizeof buf, "//sys//class//net//%s//pkey", ifreq->ifr_name); + snprintf(buf, sizeof buf, "//sys//class//net//%s//pkey", ifname); f = fopen(buf, "r"); if (!f) { printf("failed to open %s\n", buf); @@ -73,13 +73,13 @@ get_pkey(struct ifreq *ifreq, uint16_t *pkey) } static int -get_sgid(struct ifreq *ifr, union ibv_gid *sgid) +get_sgid(char *ifname, union ibv_gid *sgid) { char buf[128], *end; FILE *f; int i, p, ret; - snprintf(buf, sizeof buf, "//sys//class//net//%s//address", ifr->ifr_name); + snprintf(buf, sizeof buf, "//sys//class//net//%s//address", ifname); f = fopen(buf, "r"); if (!f) { printf("failed to open %s\n", buf); @@ -102,21 +102,20 @@ get_sgid(struct ifreq *ifr, union ibv_gid *sgid) } static int -get_devaddr(struct ifreq *ifr, - int *dev_index, uint8_t *port, uint16_t *pkey) +get_devaddr(char *ifname, int *dev_index, uint8_t *port, uint16_t *pkey) { struct ibv_device_attr dev_attr; struct ibv_port_attr port_attr; union ibv_gid sgid, gid; int ret, i; - ret = get_sgid(ifr, &sgid); + ret = get_sgid(ifname, &sgid); if (ret) { printf("unable to get sgid\n"); return ret; } - ret = get_pkey(ifr, pkey); + ret = get_pkey(ifname, pkey); if (ret) { printf("unable to get pkey\n"); return ret; @@ -199,7 +198,7 @@ int gen_addr_ip(FILE *f) if (ifr[i].ifr_hwaddr.sa_family != ARPHRD_INFINIBAND) continue; - ret = get_devaddr(&ifr[i], &dev_index, &port, &pkey); + ret = get_devaddr(ifr[i].ifr_name, &dev_index, &port, &pkey); if (ret) continue;