From patchwork Sun Feb 18 20:40:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10226941 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 7CEAB605F3 for ; Sun, 18 Feb 2018 20:40:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6902228874 for ; Sun, 18 Feb 2018 20:40:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5DDA228931; Sun, 18 Feb 2018 20:40:20 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 D935F2890E for ; Sun, 18 Feb 2018 20:40:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751688AbeBRUkP (ORCPT ); Sun, 18 Feb 2018 15:40:15 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36117 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751554AbeBRUkO (ORCPT ); Sun, 18 Feb 2018 15:40:14 -0500 Received: by mail-wm0-f68.google.com with SMTP id f3so11667410wmc.1 for ; Sun, 18 Feb 2018 12:40:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=q3JVxO2uBp031K4lSob3mZNd6k9owu5eAUdOZOzltBo=; b=F08+FoSIaP3LzCJmQIOD+KhqNQ7CSVDLJIltM3bjYDUhMK93CPA7MgtLYXOExPjSdk fTT73N3nd628RXCyBmi8xTyBwnjhZHWlZexz568wWBePeeZ344T72s2IUOEjN/dIG50n ngc9CbaZx6JCzmYLSb4C2QQFH4hBKuB15xZ4ID/TyZ+mpbnu5rFnxUZG5BTDrnf9eYU0 fFV9t740sw65fAIhbEEG0q1zyWBbC1RukziysV3R3+zdXqXiM+fvLT0aiy1aFxvVOrjN eRLQBSUyv2G2p8rWtVtSKg5RtDNweix8OLdSW9Hwkl9EghVYK3Be0kmD1Pa7u/24NMS+ gp3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=q3JVxO2uBp031K4lSob3mZNd6k9owu5eAUdOZOzltBo=; b=kXsyuqncWZHGRK0rZy67/ln25xCKyIyw5fST/Ijn/EokBDtUUjRw+Im+2dnEPyDsxL 33y43ZCjBbx5BbZkxeVtCRKscYfIUL5ZOc/HRzaojV1BdPN/AFQTWcWtNrAGXXmkAx1E NTPMBDcEyaJOuG7vVt1h3WHJXF2pUtTW0j4tSwZ+7EPp/vmYk7KGwsWilns2DDyyJYWr MZQ04TecPdqEhoX3KI9fOL3GU0S/6gvSyjDqAfDMW2nvFaXLc7IVCc4JvqRI+5M8IVXT F8Q1PwsnhkkEjkflo7d0++TaA+EDocemYHbAsLqK1u6PgeaAYRJisoABZSvL0pi4sbiq ppMQ== X-Gm-Message-State: APf1xPA7pzIsrEE1wSD11AuJPX+NESz1zrmPTkVeI3bAyD4nmMDOXyVr JQOWx/HFC6ZZVLpSaewmaPXfTDfhjlg= X-Google-Smtp-Source: AH8x224hKh1EI5Yq/8eWAEHKnU2RSdIjY+oVmbn8rTA5xP3/7leCUz5rjKynKOOw8IDL/wtn1TDOTA== X-Received: by 10.28.146.197 with SMTP id u188mr9701567wmd.124.1518986412693; Sun, 18 Feb 2018 12:40:12 -0800 (PST) Received: from ziepe.ca (S010614cc2056d97f.ed.shawcable.net. [70.74.179.152]) by smtp.gmail.com with ESMTPSA id h200sm17230765wme.11.2018.02.18.12.40.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Feb 2018 12:40:09 -0800 (PST) Received: from jgg by mlx.ziepe.ca with local (Exim 4.86_2) (envelope-from ) id 1enVkj-0001xA-Ty; Sun, 18 Feb 2018 13:40:05 -0700 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 5/6] verbs: Remove _RESERVED enums related to CREATE_CQ Date: Sun, 18 Feb 2018 13:40:01 -0700 Message-Id: <20180218204002.7408-6-jgg@ziepe.ca> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180218204002.7408-1-jgg@ziepe.ca> References: <20180218204002.7408-1-jgg@ziepe.ca> 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 From: Jason Gunthorpe The only remaining user wasn't right, so get rid of them. Signed-off-by: Jason Gunthorpe --- libibverbs/verbs.h | 2 -- providers/mlx4/verbs.c | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libibverbs/verbs.h b/libibverbs/verbs.h index 5325f8fe412276..cb96f33322dccc 100644 --- a/libibverbs/verbs.h +++ b/libibverbs/verbs.h @@ -1608,12 +1608,10 @@ struct ibv_context { enum ibv_cq_init_attr_mask { IBV_CQ_INIT_ATTR_MASK_FLAGS = 1 << 0, - IBV_CQ_INIT_ATTR_MASK_RESERVED = 1 << 1 }; enum ibv_create_cq_attr_flags { IBV_CREATE_CQ_ATTR_SINGLE_THREADED = 1 << 0, - IBV_CREATE_CQ_ATTR_RESERVED = 1 << 1, }; struct ibv_cq_init_attr_ex { diff --git a/providers/mlx4/verbs.c b/providers/mlx4/verbs.c index 3c8bcaae4765e9..9385d5b38a3d4b 100644 --- a/providers/mlx4/verbs.c +++ b/providers/mlx4/verbs.c @@ -574,7 +574,8 @@ struct ibv_cq_ex *mlx4_create_cq_ex(struct ibv_context *context, .comp_mask = cq_attr->comp_mask, .flags = cq_attr->flags}; - if (!check_comp_mask(cq_attr_c.comp_mask, IBV_CQ_INIT_ATTR_MASK_RESERVED - 1)) { + if (!check_comp_mask(cq_attr_c.comp_mask, + IBV_CQ_INIT_ATTR_MASK_FLAGS)) { errno = EINVAL; return NULL; }