From patchwork Thu Feb 11 19:07:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 8284611 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8A7E09F38B for ; Thu, 11 Feb 2016 19:07:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 83C39202FE for ; Thu, 11 Feb 2016 19:07:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C0E820121 for ; Thu, 11 Feb 2016 19:07:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750782AbcBKTHf (ORCPT ); Thu, 11 Feb 2016 14:07:35 -0500 Received: from mail-bn1bon0085.outbound.protection.outlook.com ([157.56.111.85]:35568 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750777AbcBKTHe (ORCPT ); Thu, 11 Feb 2016 14:07:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sandiskcorp.onmicrosoft.com; s=selector1-sandisk-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=S2xfwzzDWyo33d57aRkV/3sxVKkviTmNW25yMclnpPs=; b=mUeUlmVPkNYq/ZL3uyrWnrPMXYPV1gtIYSwka7AvjlzEB/z0Ta+BlQQv3LOhCIEEnPKjQ7FwH+FtuRKBI//SV4IhmCZ9lASUoa+3G7mvcJcVW6k8dLJIxqyENb9Zh986MWt+HQ2RTahZm/jibIWTYdScaWCg/VgGGZxDn3JKSeU= Received: from BY1PR0201CA0004.namprd02.prod.outlook.com (10.160.191.142) by BN1PR0201MB0817.namprd02.prod.outlook.com (10.160.170.15) with Microsoft SMTP Server (TLS) id 15.1.403.16; Thu, 11 Feb 2016 19:07:30 +0000 Received: from BY2FFO11FD031.protection.gbl (2a01:111:f400:7c0c::187) by BY1PR0201CA0004.outlook.office365.com (2a01:111:e400:4814::14) with Microsoft SMTP Server (TLS) id 15.1.409.15 via Frontend Transport; Thu, 11 Feb 2016 19:07:30 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.174) smtp.mailfrom=sandisk.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=bestguesspass action=none header.from=sandisk.com; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.174 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.174; helo=milsmgep12.sandisk.com; Received: from milsmgep12.sandisk.com (63.163.107.174) by BY2FFO11FD031.mail.protection.outlook.com (10.1.14.196) with Microsoft SMTP Server id 15.1.415.6 via Frontend Transport; Thu, 11 Feb 2016 19:07:29 +0000 Received: from MILHUBIP03.sdcorp.global.sandisk.com ( [172.22.12.162]) by (Symantec Messaging Gateway) with SMTP id FD.3E.03682.1FBDCB65; Thu, 11 Feb 2016 11:07:29 -0800 (PST) Received: from milsmgip12.sandisk.com (10.177.8.100) by MILHUBIP03.sdcorp.global.sandisk.com (10.177.9.96) with Microsoft SMTP Server id 14.3.248.2; Thu, 11 Feb 2016 11:07:29 -0800 X-AuditID: ac160a69-d23ff70000000e62-01-56bcdbf1f5f8 Received: from [10.60.52.49] ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id 6C.83.03361.1FBDCB65; Thu, 11 Feb 2016 11:07:29 -0800 (PST) Subject: [PATCH v4 13/21] IB/srpt: Inline trivial CM callback functions To: Doug Ledford References: <56BCDAAD.7030906@sandisk.com> CC: Christoph Hellwig , Sagi Grimberg , "Alex Estrin" , "linux-rdma@vger.kernel.org" From: Bart Van Assche Message-ID: <56BCDBF1.8060704@sandisk.com> Date: Thu, 11 Feb 2016 11:07:29 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <56BCDAAD.7030906@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrKLMWRmVeSWpSXmKPExsWyRoxnke7H23vCDK4d1bW48PQ7k8XL8x9Y LVauPspk8exQL4vFjbYHbA6sHov3vGTy2H2zgc3j2fTDTB7v911l8/i8SS6ANYrLJiU1J7Ms tUjfLoErY/K0jawFd0Qqei8lNjBOFexi5OSQEDCReP7lIUsXIxeHkMAmRokP19dDOTsYJTb3 t7N3MXKAVV2aqAoRn8Mo8ePWX2aQbmEBd4mPJ9+wgNgiAmoSm14tYgexhQS0JJ7397OCNDAL rGKU2HT1OliCTcBI4tv7mWANvEBF3z8tYwSxWQRUJSas3McGYosKREgc7uxih6gRlDg58wkL yBGcAtoSM69EgJjMApoS63fpg1QwC8hLbH87hxlklYTAXlaJ9hW9zBA3qEucXDKfaQKj8Cwk k2YhtM9C0r6AkXkVo1huZk5xbnpqgaGRXnFiXkpmcbZecn7uJkZwZHBl7mBcMcn8EKMAB6MS D6/BrT1hQqyJZcWVuYcYJTiYlUR4728CCvGmJFZWpRblxxeV5qQWH2KU5mBREue1blELExJI TyxJzU5NLUgtgskycXBKNTAy5snZ+IY+frw5u2Sbz+XVMxzaRFm2pivmXpNs71GVWCC+MUmm 9XF9tLGAX4mrbnHhMW1e3n+Tue6bnZ2c5vLGbb8R74a4WX84Xvw417SuSez9ta3v317K5mIo 0H4jw7BE9MTMbTXaLtnbg8ysji4NUPv7QElrWg6z4NdrJ5cHrHpuk+1/8LASS3FGoqEWc1Fx IgCS5dsTiAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDJMWRmVeSWpSXmKPExsXCtZEjRffj7T1hBmcXSltcePqdyeLl+Q+s FitXH2WyeHaol8XiRtsDNgdWj8V7XjJ57L7ZwObxbPphJo/3+66yeXzeJBfAGsVlk5Kak1mW WqRvl8CVMXnaRtaCOyIVvZcSGxinCnYxcnBICJhIXJqo2sXIxSEkMItRYtmr5exdjJwcwgLu Eh9PvmEBsUUE1CQ2vVoEFhcS0JJ43t/PCtLALLCKUeL3yg9sIAk2ASOJb+9ngjXwAhV9/7SM EcRmEVCVmLByH1iNqECExOHOLnaIGkGJkzOfsIAcwSmgLTHzSgRImFlAXeLPvEvMELa8xPa3 c5gnMPLNQtIxC0nZLCRlCxiZVzGK5WbmFOemZxYYGukVJ+alZBZn6yXn525iBIcnZ9QOxusT zQ8xMnFwSjUwHudef2q91SovBZG97GnaFYUObF2HJ8rZ1CbX5HiFH51T0+Xbm9hzJKfXTCRw otf+da42LSImBUl6nx9b2Rx9cLOOK2ydvcR/rikzJru97pY7zf/0t2jlg2IX1VuWiioOwvrF +0oePoqtdwwKNhB6JThvlcKauu/N1bcNFLI+HuSyWrP41n0lluKMREMt5qLiRAA0hnE8/wEA AA== X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD031; 1:NYiHBDRk5YceWZ1olUvE/6ggkNChHR03artvK89E1kOA2D2MNJWeOmYlRdrizAj/u8OgoYdhuCpsD1cs4DXUIv1Fi+O/jnwY8lEn2c6qckYPuXhrwyNAb6XJ0I5c0BqiZbPoaHIIMTlR4b4wJK+q0FSS1U79shjc6TVrtGTOj1Iznod9q+Mfa7tp533EKvi6KOXGbmk0meKzSeVUIFY8a/W5xkvHzXbv0wamVJF/AbxjYDlxmTFCMex8MhtmGmgtkJ5J/ABeZ9kyaYpwbMn2xFHVhp+ZH2C7WmhAakSjQxmcvoHe9rJOBLEVaQuxhbBKdT2dGXw2m69Lj8SzQy3eGH8lXGDfM2YtssSiXwm7iUWRBAkqOJk3PdkAVvZ38A45eNvBceOMzyH6qHlh+7q74dqYWLvI5U38tu/seZUdte8qwfS414aCL+MoOHUwlkHW4igk3fVPyfvzDbxqqasL2O5DpRwCxYPR3ofYkfjf8GMrFMFJ01/NBkjIsNKcsF1Y X-Forefront-Antispam-Report: CIP:63.163.107.174; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(3190300001)(189002)(199003)(229853001)(5008740100001)(86362001)(2906002)(83506001)(33656002)(77096005)(92566002)(36756003)(4326007)(59896002)(1220700001)(2950100001)(586003)(65816999)(106466001)(50466002)(19580405001)(5001960100002)(65956001)(19580395003)(80316001)(47776003)(54356999)(1096002)(50986999)(189998001)(11100500001)(4001350100001)(87266999)(65806001)(76176999)(87936001)(23676002)(64126003)(230700001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0201MB0817; H:milsmgep12.sandisk.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0817; 2:B+BsNGV2KyNU/v01eNn4Q0NOnP9wULxuhoi6Ae0l7KJ6JSVTsxl7Drvi8hIDLQ2/oEuYxCq4q78umJlsNAvgjOYDs8KEpPGvbkPQGRypRg8xqGoZhgyJ9JyE5azmLgU9agHMLoaX39THT30FK9rZIQ==; 3:FREelBq5bgPB5UqNvFu0P0i7/CzO2GvXN2xponn7lOxUMrwJbpV1VE5F+LQMvxUioI6K68qB17zlQqM0E69VKFx7S/NjQ3RiV5MSxxcs58QXWCz3656i8+tAKTAG7iyZmscgnMn4WAb2VxVJaxjLrVEIx66dwR7zUGCo5Gw8Aj/rjK5xm5kClkevILMujLVwJTTHd0dpRWbnUHBo4bc/QoTxnE1sDKBY1lUtoFUd7AB1h+1uQIqClWhL8oh6dgbAmXXR0aHxQ+nCXalS05BHig==; 25:Pwv5U1z57UNKbSQtdjvjqoBE81+WQTnjW+c/yZqvYIFVUp454l7oAJzPEC+N+TDV6XiA+Wj6nu+tHpnXZrykJLcVj5B/i6wcsZ/BSPxcwbjxryFnrR/1R9j5zQAUU2H/6fp0EbAyPqO/KULKNfJiUSb9f9zxn4SnHAF7xQf0dPzNT/xyGFZBCBIlNXiK8IVNtCDYsm5jyXhJz/uj6gxaR2D0HG34KcCsNiRudhgAaN//GX7atUjeWA7Few0WSWw5VeNSSFrSlqu8p+4IAogBWsvHDlOFpYXkgXdjbsK+9/vL+IJxbfDjPurfG5+WAozV X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501001); SRVR:BN1PR0201MB0817; X-MS-Office365-Filtering-Correlation-Id: c6474087-ecac-4a55-3e26-08d33316969a X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0817; 20:iNaZNx3GQI+OMnvlBjcukltb5mIAKE2Of3Fo2DL99rx8p9N49lO+U8oRMxlf3dO7/jkp4JauNbIKOC2QrxrczCc7d+4YOtK1Ca/DSBzym4iMrPBB+hKsPH6C1xeeZsUIDISCdTpo1gOybjMHFx48fgYBUezdsd7GkF+rLixLZfXYaUAH5zWAHJOr6KjgV9I6BkWeDM+Zqlarqfv0mcZZO04VTdbbGyMcdWgZB0YIWVUPWcqfzLjaibKpHP0VZ6+41x4zyjWRTEzmGc5+fCv0yowllRp+mimHIulXOhdRctaJIHRKHnUv3ArNBG2TC/63hdGWb+cfUoGQh2IyklCj857SNSn+VFSup4RqwFlBg5ogVtCz+kkn+6sQ4oLH/KG0yI9ZcJ/oZAmznZX7rEZfmr7ZnFS7EgfjAbkYeeaxmgVmWly5lYHiy+gV5Es/fsCaRlA2I10eBcQo0WigagRJWiB1Y0ZwIX0ohmkE5Apvq9nBcVSEHe7LZ2BnhAv3SEsa X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13017025)(13018025)(13024025)(13015025)(13023025)(8121501046)(5005006)(10201501046)(3002001); SRVR:BN1PR0201MB0817; BCL:0; PCL:0; RULEID:; SRVR:BN1PR0201MB0817; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0817; 4:vIgq7DG/U+wr74ce/ZvDA5fI5g+HtqN6cQUG+XwpJqCq5N9Q/q5vRPf+uV4bz0VMLT3MBGpxMw1HvhtfGq8Qbjtot/5mk2BJ3SaQfVJVc3YZXSY3D8sNGWSnagvN4a69f8oXE4WqC1rXWwod+MKecqH1UP4H6YsLY3Ms4MQ6g67nZdjFLODgCAzsTh3jyZ6SF/9ZvwYS/5AxGl/k1i6r50imroQCsciiYMYdsrtVHf8TCmygkDGXdgf91SpcIvTDlHc1ZJjAt0RLbqqbqiPiS6zjovv1chH4d8vnaUhFu7NWtISTfxhOxRfb+kcGSR7LLV0VEjIIUxbAcIcDagYiIyIFi4dOc7YQoapC7HU4ErpYaUL4IJUhfKtfiEzUa0KUGkgz8HrLHEJpbZynp5M0Vy85XPgMIJL1cTHq/JW6KCPrzzLVe/4cco5zM9++yTxYZRM3r80GlzRiu56HjsJIT365we3+X9Bgi7wsQGy1PfD0xXT6ja8bE/MCnElva63i X-Forefront-PRVS: 08497C3D99 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjFQUjAyMDFNQjA4MTc7MjM6bkdCYkdCd0Q3QWNCYTRMN3IyQXNBTXVY?= =?utf-8?B?dXJDQyt4dGxOUHRDNEJWTWdxZDJHUm9wQkdyeVNqRE01S0lIdXpVVVFZUlo1?= =?utf-8?B?alZSSXNXYXJhbzVqNzhwelBGY08zVlkvOVR5YnJhZzcwbW5yZ0Z2ZXNScDk5?= =?utf-8?B?TGxwTjBmbGJOOTZxTFBMQndocmRzMnRtUWtJUVgyZXFmeUJsWE1DK1dxekRO?= =?utf-8?B?K1VxMUlKU3JZQXdNalhIM0lCQmthR3dkMlp5bFJMa3B5NGZ2dldmbHA5V3Uw?= =?utf-8?B?QXdld3Q1UEdTdnd3bXRKdzU1N21WRGMrSkJrZ3dhZkZIWEdOaC91UHJ0UEhP?= =?utf-8?B?eDVRd3lFckgzWmlBbmJ3M04yZGFLRC9JZk82V3k0Q1MzV0Z1Qm9Sb1lRbkpu?= =?utf-8?B?azRzd1BjYVBsKzF3cWdObUN0RDdnd0dKemIyTGdPZkNwT2Jhd1QvMFIyTHlW?= =?utf-8?B?TStJYkgrWGk1VjhEUC8xRTYyY29lTGFveUxybERLOE4yN085WGJ6aWRzVTg3?= =?utf-8?B?eXhXOFZ0VFJsTUNaczF1Vk02anp6akpyZ1hvbDBtWENuMTlYY1dYVzdKNDJC?= =?utf-8?B?VTRPc1RzUGxrWW4zeWczcTdaQVUvUkNKbUhUd1pMTDZqYU9ZSFY5OEFuQlZW?= =?utf-8?B?ZjJRNC9Cb01XTHl1TlpYU1ZHLzdKZ1RqaVpaZ3djZDFYb1dLMlJveWNiWEJX?= =?utf-8?B?cWRSWU5SUk9KUWF5bTNkeGtCNWdMUHd6UVNpL1M4eXc1bnAxSFVISDdYZEZV?= =?utf-8?B?OGdGL0gxRTdOMVJ1MjRxOHliTnVsbEZ2R1NVQjNCWDlFaVloZ1BPWmxaMjQx?= =?utf-8?B?aGJtcjlxd3lyMnY2SzU1N0ZCS3ZoQTlZMzJYYWVzMy82SERnQlNuQVhlR3pi?= =?utf-8?B?ZCthYWNXcjBYUHpDWTJvNFJOYTZjSWlNSm8zMjh3ZzVTcGdZbjlOdXhiZEY3?= =?utf-8?B?RGF5cHhBSzNXY1BCckF1V3hrMWRUY2w0YVBqYTMyTm43enNkOXRicWxRanlY?= =?utf-8?B?UkF5YmxpVm9DUFFTb2d5czUvVGN2Qy83TkVsMEM5V3d5N1FYWUczckhDNjFm?= =?utf-8?B?dGEvTUFaOXVVbmR1Ky8xNC9YeGVYNGIyOVpqWTVGN1FRM1p6a1k3NU1GajlV?= =?utf-8?B?dzhicEVjUTVFN3NidCsxQ1ZmSWo3REZVTUl3eHdWeEd3dllWd2gyUXpzM2oy?= =?utf-8?B?Qlg1RktuL3hZL0M3dFFYVlF4SmFEeWZ1T2pOMWpzTUF3MWZtRktnMDVzTFJx?= =?utf-8?B?WDJ1cE11T050TEh6SjhZY09EM0R5bTl2VEg2ekxBK0dQSkpRVzNsZGF6VUph?= =?utf-8?B?Z3lwSnhoNjBnZFp3UENQL0YyTUdtM0FMZ0ZkYlB6dUd0cnJweDR5ZVhXRE5n?= =?utf-8?B?d3R4LysrNXc1alQ4YXVoWXhGVnQ3NzBnZkcwRkpxM0ZJWGdxdXlQYWhDTWox?= =?utf-8?B?V1ZYS0J0ZTl2SHZwbUtqZHZLdkd2WUJZSmF5M3hxdnkrRUk1by8wRFJoVCtj?= =?utf-8?B?MG9GaWNnPT0=?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0817; 5:DHqFx5rihBh6i2Cr3oNmgr3mqNfTYh2pA+/zcDFVK8/87UBzBfCWeyBXmvh0FgMwbJulYpwCInU2TNWiDJEQlhDz7I/dNhDZNRlHPFYVroQ9FLWZPMo1TzPYDkfCP3OuM+j8vv647GUjHQJDGjc4mw==; 24:kRcBtziKHoNNEaspGvr/t6mYU76E8Jy0CcF9MVxt/3bZO27HdbNIEr9y8nDGqzZXySV/gLbOkP610Y0f7Hfg5lew+ZbjxdW8UDF0ej4TFaA=; 20:nfyKJyKE+PEhggVIccQG3FHwVKMDVSvlNExyynLkaUgEErR/rHlC0It2z46nME0CECvEBx8ROzoGGgK+54hE+DPCPkpJesFtHtLPibDmHiKX727jlfrZ9xrX3Zqdm7ac9PmXoJIZOvDZhSeCm57Y7mktpStm0pzoo5Vhyb68RKuI1aYvu8FF9NIGIkAbBb+pGboY2rQf7IGbhz3xhq4L75xBCTTlvmXqe7i5A8pgZ15dPC0+OgjT3XGYQTw4fHdY SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2016 19:07:29.8047 (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.174]; Helo=[milsmgep12.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR0201MB0817 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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Inline those CM callback functions that are only two lines long. Signed-off-by: Bart Van Assche Reviewed-by: Christoph Hellwig Reviewed-by: Alex Estrin Cc: Sagi Grimberg --- drivers/infiniband/ulp/srpt/ib_srpt.c | 37 ++++++++++------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c index 64e9107..ea73594 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.c +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c @@ -2320,18 +2320,6 @@ static void srpt_cm_rtu_recv(struct ib_cm_id *cm_id) } } -static void srpt_cm_timewait_exit(struct ib_cm_id *cm_id) -{ - pr_info("Received IB TimeWait exit for cm_id %p.\n", cm_id); - srpt_drain_channel(cm_id); -} - -static void srpt_cm_rep_error(struct ib_cm_id *cm_id) -{ - pr_info("Received IB REP error for cm_id %p.\n", cm_id); - srpt_drain_channel(cm_id); -} - /** * srpt_cm_dreq_recv() - Process reception of a DREQ message. */ @@ -2370,15 +2358,6 @@ static void srpt_cm_dreq_recv(struct ib_cm_id *cm_id) } /** - * srpt_cm_drep_recv() - Process reception of a DREP message. - */ -static void srpt_cm_drep_recv(struct ib_cm_id *cm_id) -{ - pr_info("Received InfiniBand DREP message for cm_id %p.\n", cm_id); - srpt_drain_channel(cm_id); -} - -/** * srpt_cm_handler() - IB connection manager callback function. * * A non-zero return value will cause the caller destroy the CM ID. @@ -2409,22 +2388,26 @@ static int srpt_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event) srpt_cm_dreq_recv(cm_id); break; case IB_CM_DREP_RECEIVED: - srpt_cm_drep_recv(cm_id); + pr_info("Received CM DREP message for cm_id %p.\n", + cm_id); + srpt_drain_channel(cm_id); break; case IB_CM_TIMEWAIT_EXIT: - srpt_cm_timewait_exit(cm_id); + pr_info("Received CM TimeWait exit for cm_id %p.\n", cm_id); + srpt_drain_channel(cm_id); break; case IB_CM_REP_ERROR: - srpt_cm_rep_error(cm_id); + pr_info("Received CM REP error for cm_id %p.\n", cm_id); + srpt_drain_channel(cm_id); break; case IB_CM_DREQ_ERROR: - pr_info("Received IB DREQ ERROR event.\n"); + pr_info("Received CM DREQ ERROR event.\n"); break; case IB_CM_MRA_RECEIVED: - pr_info("Received IB MRA event\n"); + pr_info("Received CM MRA event\n"); break; default: - pr_err("received unrecognized IB CM event %d\n", event->event); + pr_err("received unrecognized CM event %d\n", event->event); break; }