From patchwork Tue Oct 27 22:02:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 7504301 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9AD3ABEEA4 for ; Tue, 27 Oct 2015 22:02:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B6894209C8 for ; Tue, 27 Oct 2015 22:02:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A1D36209C7 for ; Tue, 27 Oct 2015 22:02:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932330AbbJ0WCS (ORCPT ); Tue, 27 Oct 2015 18:02:18 -0400 Received: from mail-bn1bon0054.outbound.protection.outlook.com ([157.56.111.54]:44448 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932152AbbJ0WCP (ORCPT ); Tue, 27 Oct 2015 18:02:15 -0400 Received: from DM2PR0201MB0749.namprd02.prod.outlook.com (10.160.94.25) by DM2PR0201MB0863.namprd02.prod.outlook.com (10.160.95.19) with Microsoft SMTP Server (TLS) id 15.1.306.13; Tue, 27 Oct 2015 22:02:14 +0000 Received: from BY2PR02CA0032.namprd02.prod.outlook.com (10.141.216.22) by DM2PR0201MB0749.namprd02.prod.outlook.com (10.160.94.25) with Microsoft SMTP Server (TLS) id 15.1.306.13; Tue, 27 Oct 2015 22:02:12 +0000 Received: from BN1AFFO11FD045.protection.gbl (2a01:111:f400:7c10::174) by BY2PR02CA0032.outlook.office365.com (2a01:111:e400:2c40::22) with Microsoft SMTP Server (TLS) id 15.1.312.18 via Frontend Transport; Tue, 27 Oct 2015 22:02:12 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.173) smtp.mailfrom=sandisk.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=sandisk.com; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.173 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.173; helo=milsmgep12.sandisk.com; Received: from milsmgep12.sandisk.com (63.163.107.173) by BN1AFFO11FD045.mail.protection.outlook.com (10.58.53.60) with Microsoft SMTP Server id 15.1.306.13 via Frontend Transport; Tue, 27 Oct 2015 22:02:11 +0000 Received: from MILHUBIP04.sdcorp.global.sandisk.com ( [172.22.12.162]) by milsmgep12.sandisk.com (Symantec Messaging Gateway) with SMTP id 1A.C7.32178.364FF265; Tue, 27 Oct 2015 15:02:11 -0700 (PDT) Received: from milsmgip11.sandisk.com (10.177.8.100) by MILHUBIP04.sdcorp.global.sandisk.com (10.177.9.97) with Microsoft SMTP Server id 14.3.248.2; Tue, 27 Oct 2015 15:02:11 -0700 X-AuditID: ac160a69-f79f76d000007db2-12-562ff463bbe5 Received: from [10.60.52.33] ( [10.177.8.100]) by milsmgip11.sandisk.com (Symantec Messaging Gateway) with SMTP id 55.5E.03643.364FF265; Tue, 27 Oct 2015 15:02:11 -0700 (PDT) Subject: [PATCH 3/7] IB/srp: Rename work request ID labels To: Doug Ledford References: <562FF404.7000504@sandisk.com> CC: Sagi Grimberg , Sebastian Parschauer , "linux-rdma@vger.kernel.org" From: Bart Van Assche Message-ID: <562FF463.40107@sandisk.com> Date: Tue, 27 Oct 2015 15:02:11 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <562FF404.7000504@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRmVeSWpSXmKPExsWyRoxnkW7yF/0wgyPdshYvz39gtXh2qJfF 4vXxp0wWJ2/zO7B4TJ+xidXjz5/PzB7v911l8/i8SS6AJYrLJiU1J7MstUjfLoErY+7282wF v4QrFi59xtzAOEegi5GTQ0LARKLjxXZ2CFtM4sK99WxdjFwcQgInGCWmHvzCCOHsYJRoeNnK BtPxdukmFhBbSGATo8SSHyogtrCAlcSNP7eZQWwRATWJTa8WsUPUaEl8f/iBHWQQs8BSoEHH loMl2ASMJL69nwk2iFdAQ6J/9iKwZhYBVYn/PZPB4qICERITJzSwQtQISpyc+QQszimgLXHp 3TumLkYOoKGaEut36YOEmQXkJba/ncMMsktCYBurxNy3t6COUJc4uWQ+0wRGkVlIRs1CaJ+F pH0BI/MqRrHczJzi3PTUAkMjveLEvJTM4my95PzcTYzg+ODK3MG4YpL5IUYBDkYlHl6DCr0w IdbEsuLK3EOMEhzMSiK8Pdn6YUK8KYmVValF+fFFpTmpxYcYpTlYlMR5rVvUwoQE0hNLUrNT UwtSi2CyTBycUg2MhnozHoto9G86Z7FNOihwIteSBwe713WVhte5ekxPVD2/6bxi38eHF3PC tP8yHxdViDlRduR0lB6jH8PqgxZpYm1/DzAeNOC9sWtGo0mstIj2X/N1p91ePM/TXfrP9LIa J9Mx3V9t2x5dmP2/MKub1Sn6GKdQ6L6dx17ODP4jsXnRktKgJ5PrlViKMxINtZiLihMBuxC+ UIsCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrAJMWRmVeSWpSXmKPExsXCtZEjRTf5i36YwY2NfBYvz39gtXh2qJfF 4vXxp0wWJ2/zO7B4TJ+xidXjz5/PzB7v911l8/i8SS6AJYrLJiU1J7MstUjfLoErY+7282wF v4QrFi59xtzAOEegi5GTQ0LAROLt0k0sELaYxIV769m6GLk4hAQ2MEp0zVzKCpIQFrCSuPHn NjOILSKgJrHp1SJ2EFtIQEvi+8MP7CANzAJLGSV+9P8Em8QmYCTx7f1MMJtXQEOif/YisGYW AVWJ/z2TweKiAhESEyc0sELUCEqcnPkELM4poC1x6d07JhCbWUBd4s+8S8wQtrzE9rdzmCcw 8s9C0jILSdksJGULGJlXMYrlZuYU56ZnFhga6hUn5qVkFmfrJefnbmIEhyln5A7GpxPNDzEy cXBKNTA+ijyyX2JKc6e1+/mVRxf9fK3wjvNEX0vEYpstYgnyga1pWZ1J4QEb9XzMtsmtiXzk c0b5zupCv6lpXiFejTMUuoyMpqQd+XvpVeyXhHecj2pU/UwWHlp0o4DRW+9e1OUZ3577C5ok Xdw9c839SQw6rQ5+zAcDWO9PYJ+ulLM2jXNu6+nGuTOVWIozEg21mIuKEwF7xZaAAwIAAA== X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD045; 1:Ln/ieS1Zd5u3M/B95uDXwA7CiDuzDiQav/tP3diI+CTYs6Mz8O7cahIF+D5AGeXyytPSNdvctH+G3Rmz79BLRhNT6kg+leMG7Xuq9u3sUsOsuVsrcc/tCVih69QIW4h9BSJ7bSxB4oGC23XHFBy53Ecyi4C00On1c1yKYoyA3nNPXlS5IoazilDq9o4QvZ2tKzElnKDKRHqBf71aJDrAenqGuSFARKgQC4f8AGwvrczs+xrHZQwWUEVrQQjo5hkmOtwUYOIALZyUDTo+LUfK2N2GoOrhBiXk05yOak25mMuXsaZjCrdX4xUvXAvUBwTgG6oQj8YKBhaXgVaUbpcXnXXO014I0MXF3r5vRj+gBabmcTCz22Ga/GY9rXskG/UIPyD+GBFmFLH4dYRGG5PRIA== X-Forefront-Antispam-Report: CIP:63.163.107.173; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(189002)(199003)(33656002)(5007970100001)(65806001)(65956001)(65816999)(87936001)(36756003)(23676002)(47776003)(54356999)(76176999)(50466002)(11100500001)(19580405001)(92566002)(69596002)(2950100001)(19580395003)(50986999)(77096005)(110136002)(229853001)(106466001)(64126003)(83506001)(189998001)(86362001)(4001350100001)(5008740100001)(81156007)(5001960100002)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0201MB0749; H:milsmgep12.sandisk.com; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0201MB0749; 2:WTdXTS1XmapvZyL4sj5ZIzuL1Cvxw7WdVLNpvalVNk320DlGyN/kpmVBzQizspTu2G7QhiAfbVBRqWQ6oGpw9A+kbf22n34+zjK+CiHoDYmtnTjD5Tty5CKyJfvdEgw8av7Bb0VdZDEL4KKp9qYFAkdnwbUsAFkvx0+Nr9nsMcg=; 3:bO7Wgd4Qb2GPV51FmJDEIp9cm50t0oCKEOHg5Ror/FNqDl4V96DXyCtQBR71h5C51ei4w80a/qr+Ve2Q9o4tpxViYu6G3RrXHknM6jZSPDO5AV3uRbMHq/btauShFcxzhN1UggnwG1IsIzSxs7ZBPJNSKleagQEerMoVQxHgpaZ8bfdl/kZgVrWkfPu2V9+eWsBOTBuO6HiAG96X8fGNYudN4DWyRpgSdmNGGHvxOC6okm10qk/8b1pEOcanAOWCbmxonyWTSaOMvzLPx99Pxw==; 25:wfBoXOjICs0/sXJE7v+o988XycYw1ndnzyJYM4QStpiBzQhdR2I+fz7H4x/I1LtMc8oID/YrYpGutBwUnYe39eQk9F4nZhS/ElC17MdAbWHg1Az23oBf5dtz5uLckmJsCiORezylV98FykK8aL/H12mdZqIoe+3tzGhFsajR0YlmbkdmEVghQPkWlaplNkOCMxov/z+QyPJgOCm5p5orLnMOe+lTobRkpTGomkcM3BwMa6zhU9tjOPo1uAW9F0b28AyG/tUu9IfINorfy6/H/Q== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501001); SRVR:DM2PR0201MB0749; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0201MB0749; 20:00sQePzTQmO2RKcEUXb2d2y1edt8gXwa7wo36iBexN082x1bZMZFIP0XX2nQ7no6KCuRbpYScm+9XGrocV1iJ02jchKBiosfz+4l7hZSLXe4qiHR0//46IQ7fmfONcd5HnGE68XbS1pHXWPQ0zx8wH2Rja3QzXG+9f1UxnV+aDhadRIkJuYL/36txjTYpfw/6Z4JMRbsLGDccnKiTgsWlBo37ESs0ZXIL886Iyaey+eyWN9dykup4KXQy1au+DKSlff2rkApTk7cavWnJ8/w5Tc/st4qouDpWIQVUoffH+mYDxm2X3/0tLWsg7pf/qrw9bIOKQzzORbnY1NAIV9fUiXQjmJU2fLTbrGMxOyE4a8uJvTYmfbB1qZ/J/B6/4A+pghpQZ+K6ty2Jee4BU4lKI68nA7p+OSxTCcK3G3yqW91F0NCt79kldjDWuOPfYHk+sMcDeELdibD7CCInNZHpeUXZTofxwEuQZg/8Zo5PUL9qmITikoxuQxVkcG0PysH; 4:kzJ/Bz9sQeVfvY2lUmeHDsduOHRT4ghHFKrNX1AZOqbgyK71daEMABD/6AVsSj3sCBLW4hCA+D12FSMjZ5qW52r7i9dgPsTffBq60yxtyBQ9TSWp85hdL3E8rlyvPKuk6be/RYvDFrSuytBq70vUlUwGF2urxk/xrtlfOGWOjw5N8C/elXsn7D79gpAWTQC6Y5jWmHziwmOiIyyqPHVW28avbJDbWG7VG/nHaz8vqGd1GCI6Ou0oKNDZNCTz4QN8RhaFFS77UiMSoLTnWWDWXIR2GWPCpgUHz6fM8O8Zd7ipYKiPQf87hJaKWoOjt4ZlWvMhFN8mmRs3NN27nSrth8/2Ee56F6tQDskE6UX0IpHVgDLlO79481aUKkfeFAnDVBJbac+vSB2W8Ucetk0Igg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(34787635062028)(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(520078)(3002001)(10201501036)(102215026); SRVR:DM2PR0201MB0749; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0201MB0749; X-Forefront-PRVS: 0742443479 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTJQUjAyMDFNQjA3NDk7MjM6T0JBdmUzSEhnbWtiMlhTYVJwR1FvZWZR?= =?utf-8?B?NnUvVkxzU0RDWU1kMkJtQW5KUGpERHE5Y0g5V0ZtcGF0U29NOFRwM0c4Y3dV?= =?utf-8?B?ZE13cExGbG5USEd3WXU5cVI0V3lXTXlJam1TbVhDWC94MUVySXJoS2MvTHli?= =?utf-8?B?QXF1MDU1TVFwcXFIWnBKSzhsTi9qbDdKTlRiZzRlM2xDMW4zQVozMkFoek80?= =?utf-8?B?ajRSY0p2OWl6TDJrZU82R0UxSHhFb2ZjNFBhdytHTGUvRG1TMFpPOHB5elFY?= =?utf-8?B?ZFpPeWxzemN4c29jUFc1RWVUbnRLK1NRcjNucFIweGtsUzF3VlpqRG1pN1M3?= =?utf-8?B?Y1RKZkE1SDhnUTBLdW83TUZndlRPNFZ4U1pLVldqRjhyK2FDWUlUT1lYbW42?= =?utf-8?B?WTkrSnNDN2ZwOUc5Vmx6K3ZTeUs0YnRFTzkxK0Jpd29JV0JZNnVuZm1qeXNw?= =?utf-8?B?SXFHTlBVK1NLOXRLQWNEUG56RThvbkU3UUt2M0RJZXNUbVV6OEhubGFZRSsv?= =?utf-8?B?MFdWaUEvMnBSZlFPRGROTnRYM0xYNnFSdXh2elNXQ1hobHN3WGJkL0k4ekJZ?= =?utf-8?B?L3V6bDdzM0Jrc2ZiZVpTWUcvTW9FQzA3c21IRjJJUDBOL0cra3dFbFc2a21p?= =?utf-8?B?N2tsbzZua0JXdG94OEFocnpqL0dGL0VrYmd1ZHBDT3dPUzBxYTBjc0pMcEtB?= =?utf-8?B?TEdRN1VZNUQ0a3o1b3lNZHV3MUxjQ1NpUnN5RjhlTkpyQ2FXNjExcWdVYW9U?= =?utf-8?B?bmowakVYQ1M2SEVyWEp2bHBjWDRRVWZFQVpMR3EzZlpsaEZvSFVTdWpiOEMv?= =?utf-8?B?M3QySGNvWVZXa0x1eHppNmxXSlhvSDB2V0R0RDU3bXRuWVZ6NCtVQVd5R2RT?= =?utf-8?B?WjIzVVlxSDlVN1pQT0REQ2UxSFNhRFB6b1QxYWhGcCt1V0lqQlVhR1ZneGE1?= =?utf-8?B?emxaeGFKTXRxR3BwRlYrT2RvT1gwWnE0UjQxWTNPblcxQkkxTEsxZjd5SVho?= =?utf-8?B?U1M2dmZiZkRLbkZ2RzVwYTZQbW5aVFRtUXJoSkVkbFVZMDRnNVRHQUFYbkJu?= =?utf-8?B?ajZKSzFzRVo5NGxXTno5eGdhQ1BxT2NlMU9tZ0V5TTZZUmVsd2VOSWNmOThv?= =?utf-8?B?RTkyQXdzcFRGeElLdVkwNnJDYXZmR1pyb0hUeHo1WVlabWliOWUxQTZzV2lm?= =?utf-8?B?bVlmUS8rUTZTdlhhaGVncW0vLzJMUWg4RVIvUFZ2SEtsNXlHOENlYXJ3THNx?= =?utf-8?B?SkY5MExXaFFCQUVoYmlMeDB4bktLSkNHYmx2eE5NVTFFUUQ2dWJKQUdqVGFV?= =?utf-8?B?VVpUaEo2TmxHZUJBcFpkL1NRa1ArQzhmdEd6MWhmMGw0akpsdTBqQkRHcVho?= =?utf-8?Q?s2+WfDR/tM?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0201MB0749; 5:tETKfzWwsEoP9BgmH7X9XQEi8gArz+Zx5Ew0GQ9ATtIO/5EZ4yRVrUPNLscOtoMOxgRKZ8QwITtjK2dKCHtlZjboCxgdkqHui6m+P4fywByG0rvsowT54r0DkT/IYihwCK4MSyINYgpe6NLeiE2dZQ==; 24:Ox8Wn3tvspLiwkM52SV8bIlZwpgZ5f/F2OkOrLJZ3FsDyK23ajpLTelBuPxD4eCWFuxcWb5Qmqf/I8JMa5WLWe+2+gYNVd0iEIlgjoTADoY=; 20:zOJSzHmW+BrMrFNKFKjKxkeLKrLR3qR/AI+cinoDoNc7fOC7zKvGTzQ03gYK5Ygv4mD5CyAzVOnEekzn9UR/byGAgWTfNS/voVI53da4xGCLrhOEkyQXqMYqoksLCGT0SLz3+mVzw38yr8FEy0ebG0DTAYCTOkpM9rtsICvb06tKgl84grMgQu9pwIuqzmLSpufAhulK9KpZKE28L78zAuspUMa3RpzCGxcosh76BBuYDdEQm7rbRSmfEUTqmwsy SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2015 22:02:11.7543 (UTC) X-MS-Exchange-CrossTenant-Id: fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d; Ip=[63.163.107.173]; Helo=[milsmgep12.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0201MB0749 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0201MB0863; 2:22rEx1LctliIYPD7v9Igi5qWbQox0XUp4MeiST/jympVpAKgzBOsle2m8Ad+7Fd71owEzxD6kdW8O67vlB8gBgGL1IdyvIgd4ACHeB/scFoBI8Rtq/k8ictkfnngKMOGe946yJGyF8r/nb6slE3zDgO1vF0nPdrx0Cfa+MGx1t8=; 23:4v9tqqOUurDk+lRsBvF+4r41lnnzTbR+QLeDV81g9O2tSWrocqetmPymE0nlz7tdVM1YIECj1CbO3xvfDDphrFRVAeBThMpEGYyY56eDj1zr/O57HuRQCPC+tEEMI9So6Fa1hy5jALVB3TEv4f8zSA/LQsXrm/NPaL/E1gfqSMmMLnbRkitzMzC0hrvbmy06 X-OriginatorOrg: sandisk.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=-6.9 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 Work request IDs in the SRP initiator driver are either a pointer or a value that is not a valid pointer. Since the local invalidate and fast registration work requests IDs are not used as masks drop the suffix "mask" from their name. Signed-off-by: Bart Van Assche Cc: Sagi Grimberg Cc: Sebastian Parschauer Reviewed-by: Sagi Grimberg --- drivers/infiniband/ulp/srp/ib_srp.c | 8 ++++---- drivers/infiniband/ulp/srp/ib_srp.h | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index c1faf70..1aa9a4c 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -1049,7 +1049,7 @@ static int srp_inv_rkey(struct srp_rdma_ch *ch, u32 rkey) struct ib_send_wr *bad_wr; struct ib_send_wr wr = { .opcode = IB_WR_LOCAL_INV, - .wr_id = LOCAL_INV_WR_ID_MASK, + .wr_id = LOCAL_INV_WR_ID, .next = NULL, .num_sge = 0, .send_flags = 0, @@ -1325,7 +1325,7 @@ static int srp_map_finish_fr(struct srp_map_state *state, memset(&wr, 0, sizeof(wr)); wr.opcode = IB_WR_FAST_REG_MR; - wr.wr_id = FAST_REG_WR_ID_MASK; + wr.wr_id = FAST_REG_WR_ID; wr.wr.fast_reg.iova_start = state->base_dma_addr; wr.wr.fast_reg.page_list = desc->frpl; wr.wr.fast_reg.page_list_len = state->npages; @@ -1940,11 +1940,11 @@ static void srp_handle_qp_err(u64 wr_id, enum ib_wc_status wc_status, } if (ch->connected && !target->qp_in_error) { - if (wr_id & LOCAL_INV_WR_ID_MASK) { + if (wr_id == LOCAL_INV_WR_ID) { shost_printk(KERN_ERR, target->scsi_host, PFX "LOCAL_INV failed with status %s (%d)\n", ib_wc_status_msg(wc_status), wc_status); - } else if (wr_id & FAST_REG_WR_ID_MASK) { + } else if (wr_id == FAST_REG_WR_ID) { shost_printk(KERN_ERR, target->scsi_host, PFX "FAST_REG_MR failed status %s (%d)\n", ib_wc_status_msg(wc_status), wc_status); diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h index 3608f2e..1c6a715 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.h +++ b/drivers/infiniband/ulp/srp/ib_srp.h @@ -67,10 +67,9 @@ enum { SRP_MAX_PAGES_PER_MR = 512, - LOCAL_INV_WR_ID_MASK = 1, - FAST_REG_WR_ID_MASK = 2, - - SRP_LAST_WR_ID = 0xfffffffcU, + LOCAL_INV_WR_ID = 1, + FAST_REG_WR_ID = 2, + SRP_LAST_WR_ID = 3, }; enum srp_target_state {