From patchwork Thu Mar 9 15:38:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 9613591 X-Patchwork-Delegate: ira.weiny@intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7FE2B60414 for ; Thu, 9 Mar 2017 15:40:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61AFF28676 for ; Thu, 9 Mar 2017 15:40:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 568102867A; Thu, 9 Mar 2017 15:40:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E521E28676 for ; Thu, 9 Mar 2017 15:40:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932093AbdCIPkK (ORCPT ); Thu, 9 Mar 2017 10:40:10 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35006 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753196AbdCIPkI (ORCPT ); Thu, 9 Mar 2017 10:40:08 -0500 Received: by mail-wm0-f66.google.com with SMTP id z63so11543278wmg.2 for ; Thu, 09 Mar 2017 07:38:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dev-mellanox-co-il.20150623.gappssmtp.com; s=20150623; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=IEGKi6GA5o6RpeDkxJ+GARzhsMYa9KEUBKt7iJ3jzfo=; b=WKKougOxC3jh2spR7cOkdPDzqf6LmHf0SK2j6U5MXmx+ACqshL57Itf1RJvfy2DeUt Y4lMWqctHsES/lMDiYHu9NcYYXuRiaEdwk6t3XHLTXr6cyT4tImXuc1KDM7NQVIsmihj +KCz2cYKFQv53m8X9W1TL1/lLBQafOsDCZYfFDAPYo2ZuP2zqLjMDptm3zZ9rte3zX2H bzm3HGLPfDwzIlMHyO+2MtbHIj/d0m2AmN5udej0gK43Tyoi3hJn+EygtC9EbyMFpyMB O5SsJcM9oFtAWGbgW60bCcSrCxlbiSYTzlDzbkrZgPTZPCMJnLIvahOriTmgJRnpvwlp aaxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=IEGKi6GA5o6RpeDkxJ+GARzhsMYa9KEUBKt7iJ3jzfo=; b=qKQttsWYtzT47vOjyY1TcLHy5i87qKX0amDaDGopdRFHizVrmsnR4RIucMPzA3jeEq 13HgOK3WkPV5k1vSgdvQNaxCPVtGXtgW+LCtkL0uha9zd9+fMDqvMRl1jOwhDU9IWLJ8 oJCMWmFCfHQI3hApnkzVLosMz65iMtO9I9p5jM06zT/M0ju/XJI6DLNwmEhF9sNZ4tmW DOnl+Wk8n3NSxzPXnUdm6V6QfHb0s6z77+Qqq41zaLPvwRbeGjdJUBiV3X1EKvNZQhI8 ft6y3Yv9CJ9unUZHent1NRT/DB26JA4lyjYSGNiJd8ny3KUxBWxytcIV2Q23gIiH/LT8 eJ9A== X-Gm-Message-State: AMke39kgk6KOiMt+rMzmaNV87VOq/7n+D9C/vogXT952pRc5eH5XqFJIPWMjkgUE/Jhqfg== X-Received: by 10.28.215.138 with SMTP id o132mr10687882wmg.41.1489073931917; Thu, 09 Mar 2017 07:38:51 -0800 (PST) Received: from [192.168.1.183] (c-50-177-105-67.hsd1.ma.comcast.net. [50.177.105.67]) by smtp.googlemail.com with ESMTPSA id o15sm27738645wmd.10.2017.03.09.07.38.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Mar 2017 07:38:51 -0800 (PST) To: "Weiny, Ira" Cc: "linux-rdma@vger.kernel.org" From: Hal Rosenstock Subject: [PATCH infiniband-diags] saquery.c: Remove use of to be deprecated ib_gid_t Message-ID: Date: Thu, 9 Mar 2017 10:38:50 -0500 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP which will be going away in a future version of libibmad Signed-off-by: Hal Rosenstock --- -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/saquery.c b/src/saquery.c index ea946a1..6b7eb5d 100644 --- a/src/saquery.c +++ b/src/saquery.c @@ -69,7 +69,7 @@ struct query_params { uint64_t service_id; - ib_gid_t sgid, dgid, gid, mgid; + ibmad_gid_t sgid, dgid, gid, mgid; uint16_t slid, dlid, mlid; uint32_t flow_label; int hop_limit; @@ -118,9 +118,9 @@ int requested_lid_flag = 0; uint64_t requested_guid = 0; int requested_guid_flag = 0; -static unsigned valid_gid(ib_gid_t * gid) +static unsigned valid_gid(ibmad_gid_t * gid) { - ib_gid_t zero_gid; + ibmad_gid_t zero_gid; memset(&zero_gid, 0, sizeof zero_gid); return memcmp(&zero_gid, gid, sizeof(*gid)); }