From patchwork Sun Jul 2 07:29:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalderon, Michal" X-Patchwork-Id: 9821063 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 94B596035F for ; Sun, 2 Jul 2017 07:32:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F6042821F for ; Sun, 2 Jul 2017 07:32:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7175328334; Sun, 2 Jul 2017 07:32:04 +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 A7EA22821F for ; Sun, 2 Jul 2017 07:32:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751635AbdGBHb5 (ORCPT ); Sun, 2 Jul 2017 03:31:57 -0400 Received: from mail-co1nam03on0066.outbound.protection.outlook.com ([104.47.40.66]:6304 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750771AbdGBHbz (ORCPT ); Sun, 2 Jul 2017 03:31:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=FmBmnn1f3lROhJWj+8X/0wfrhXXto6mMmMuVk4yRZgE=; b=EJJKJStY3lVpLymgsuD2Gt/ZFB8IT47ZyXU9Hr1zc4KTAAKXZYDYi53oAWiLm45/8oUxmNYr0p7e88VrLPehRLjQUa16cvrKvZ7Ar4SRpyO+pDafGR2YSRFxG4AvlKw19mt8bKRuokionXg48/STE+yfIyQH8vaUm067nuA/51A= Received: from CO2PR07CA0072.namprd07.prod.outlook.com (10.174.192.40) by BY2PR07MB1522.namprd07.prod.outlook.com (10.162.77.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1199.15; Sun, 2 Jul 2017 07:31:52 +0000 Received: from BN1BFFO11FD011.protection.gbl (2a01:111:f400:7c10::1:141) by CO2PR07CA0072.outlook.office365.com (2603:10b6:100::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1220.11 via Frontend Transport; Sun, 2 Jul 2017 07:31:51 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BN1BFFO11FD011.mail.protection.outlook.com (10.58.144.74) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1199.9 via Frontend Transport; Sun, 2 Jul 2017 07:31:50 +0000 Received: from lb-tlvb-michal.il.qlogic.com.com (10.185.6.89) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Sun, 2 Jul 2017 00:31:48 -0700 From: Michal Kalderon To: , , , , , , , CC: Michal Kalderon , Yuval Mintz , Ariel Elior Subject: [PATCH net-next 03/12] qed: Rename some ll2 related defines Date: Sun, 2 Jul 2017 10:29:23 +0300 Message-ID: <1498980572-29519-4-git-send-email-Michal.Kalderon@cavium.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1498980572-29519-1-git-send-email-Michal.Kalderon@cavium.com> References: <1498980572-29519-1-git-send-email-Michal.Kalderon@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39450400003)(39410400002)(39850400002)(39400400002)(39840400002)(2980300002)(428002)(189002)(199003)(9170700003)(38730400002)(107886003)(478600001)(72206003)(86362001)(4326008)(626005)(81166006)(105586002)(106466001)(50226002)(50466002)(2906002)(356003)(5003940100001)(8936002)(47776003)(54906002)(305945005)(8676002)(6666003)(101416001)(50986999)(2950100002)(2201001)(36756003)(104016004)(76176999)(5660300001)(77096006)(189998001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR07MB1522; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD011; 1:fVgT5VM+M/R5DP8S9WcoDj8o8UdCYR5vVyQgOMmzx2riv9u/c1QCe6ZQecdv4rKZ/jcPz0qiArs+oOIA9aRPufN61fyRMnLf2LY673Lnse2nGFGZdLkf0H9U1IjdMGZiPG7l5htgbxdiue2GQpTs8A+tDX2/pto53GDcCDlZeu4mEI1DxfDQnctua059OTG6pHudDor7DTPOQWFWzFVpORsuIoqBCo+iDwXTFIokRFuv1Dn3Vx+6jNQOORT8myM3+SNd2WasaI5MTbbWMI7Ybqyy8dCFcRYX2jQbNjYJkwbSQFFfaRMj0ZfcGmihWf23FbZk8LD9ZPJFlldPxq5KR/jMHus5Snb11+F+PXTrCVOCcbeRxEjCrAvNEq0I935sDqML1z8gviQ2OHn43IT9dBRHOH9JqoZTTRCC6NYQqquOt1JoNvLtdiTyQiZldAYrYiexm/owFlBNFg8Slywcam99+EwJ1LBNLMMHM7vpf4XET/8jmDJh8dSXIJH/Ilpz/GebxB9yU0SZbU/kSovjQWu62q/AneMigeyFQc65IXVMZTD3TAc024rzijikNP0swfKcBDTKHU/euXjB3V3hIZND32t71XajJS4CDrIh2OWMyqSbXl/4kFjMA4rl1f2KmL5An6RgIHNSok1S310LyHlJ/yYr5SBGeSMIwTBzr3lPrd7ToR9bZx91ldhXsIxJ2BLaHTbl75DqqoNsjtApJJjEALJ8CfeQMuWhC2/PXmwVfrcaZyU5CA3wiOyrONjJM8Yqdghw8Qm8xnswyRrMpFU2l1dxEB8rVVaVaq+MOGB03yoT205Tbqmln/CdWGk8XNGdyYQMucHoDGwzE40v0yQACixJ9xPeR+j4yOTHLBo= X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b582214d-c051-4f1e-9e00-08d4c11c67f4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254075)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BY2PR07MB1522; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1522; 3:YvvLYiVQz633WBRX52wMCQbf580txXK7eLzWPip5unCPtXQdujC4MB8DFpg0Oc54GLlIOpwSbgHvDN4HgG9LKqylscPmzjTb9Sx25G0z6Dn5KA5i3tEJJcxuwnvHvb/WHTxYR3df4H+7SDcz87w+2fbxAVq4Mf94d3Ks/q3tZdJviCRtArZQBF2bSL3ok1yHOgSC/EIPkYZcs3MTajs9VV1/p5O6jDgU1J57IpkKXjblRQBIyXbP5741EOzvDIDnI+VE0LjIbh533R50tI7IxUUHNJnxj/VCMH+VpGZvf4BvuBHWNHJ2n0vWz+/OD+cdopo40cF0vQan1XzvyzwnYz8h91eKFjjFy9xjFdAPwWwK1+EvRo17iMkAU88k6cfihkMehVEhP4rUdEiik7OKvbwY8kat1kcMR1NSZ2UsEEPQaMawKCO6lCbHjdB5zxuPUzIuFFUYBHJ4zDcFL8UB4giOHmcw5Z4PkYzy6SIY8N/GqcGgINerOao47GpQw0vNWEjeoZjSksPuWMLnFeZNdy/Ud2ORnv9cyy7zPwOA/VH4ukbUAhbLT/6o5cbKzNjZ8UwRuwNXO2T+i8qSLN9mzLZ2CGNYmpK53mXZQxN7mdSi7T2MQ/soYCmOGN4VHKwkpPA3Tu7D5cnxD+7NBlJzYvYBuF4ghNSWaH7wUZfmCYW6bJpPmhwFZ5nVuLBP6tHhLLQOB+dL8L1NQ8ynk5O6sFOOeP4CY0oPgcAWmCsDWL3w0Adr3l/Iai1x4E0O7dR8lJoClYFQTj4t1Gp/WruFNe92gjskkJpUD4fNNXtwTIjdTgw/2oYn5t7/Aa14S0JgrE1kHFoQ8UvkP97ofPsMf2OoEojHpyVNmiu0d5QWfUV319Q8O1nFFvlNzVysSTxEhCX3u/RoGigsDIjdQLGkGA== X-MS-TrafficTypeDiagnostic: BY2PR07MB1522: X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1522; 25:hoP0kay4oLWJ9HbDzOqZ6SYsdwoSliYNHGsTSezPbo1V9EF5fYPK/iWcDzyBDKIYgSj08KTNExCbH0Hrg21F32QwmOX6Cz/p8olIGu5FHFjVXnK24EI5zcz/vOZc8krMzN50Hp6aCtH/zAs+nz/7x9jg36Dq96VzI1QNN5V8BICWCwrlXkNRcq+8dePOFKgV5tCUE/2UmpPlx71nLGHhplXYx9aBEUyRWtuSO0x9I6i6ILPNZ+xp2bw61D8mVydRdF7Afd9MgNEuCS8OWXfc5f0YF/4/sM/T7Fu2mgUl+ITrNDZ+SYDfiIjfZwYWb8BHTIkEnqWiwN3EDU0YCkf7M0Yudlu4bJb2riH6Pev5GITv4CgQpmjnbdEbr+DuuBGD5llq5yde1Fob8JOD3Kqei9FDDsO1HCCmQ5tXzK4LO3Ce5prFcEX9w1spJgQlZxlfhvWlRmqM2V2scl93DV0XRAdCurKHLJPvoyVva5lBoC+TMfSro0Njmr113BKMhVGTkR3woR0+BPxbcie6daXC2kil+opTJmr58sLFx7k3OhENWnLw5IO+l7uesl1dqwqXMhExbRO18U4cOC79HAbrkiWkAYHBuvsJz4FqfSGDVOoOrp1Ub8H0Yjvp+NhhbzwrMgM+srXWpyQj0Sn0PdIwL5wpEkyMFywU31Btqm5htNuyAZLuUOCvnxulxy1wpyHYlb/whBgBJZw6gmSOO4+GymTuFpHw5H8dvtYQz3vph4aJJLL3c9WUMTAsRCrRZ5FZHsWdk3BJdJX9ZYBl4IQfUkzOm3GmqUwS+h8DjbtXFYcl2Bl6R+JQ4TBIhH095wAmstBbun0yAEYcztBzSG4UG19O/3jUtYKasu7cdZ26OeRewWtRkNRL+DJ7vSPc51I10Ho0Md3wAXZJb8ijsYxFFHATiP81ZLkyZcUZIPmPn 8I= X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1522; 31:kOz8WAySbIuGUQVITRTKqepI2Cn0u2cv17HMUNB/X9FkPunABCLr4bcKyfBcmL2AQvrPQns5Pz+UgVRPpC6XtI0ZUQbod85gQDMIT5IdckrxhWafi5NdSZNZj9hqTb+r8MxbwSBBydOB9tuPuwUcCHCANT4j1JwjFWrCfzefyZkjsCtMCh2xTTinrs17X9EbuNgEd1a8zTZIvLQFLOWu0PhGr7jx82QTdp+oDaE2+BoDe4zYAaj9Xbz/XcadKPIVFkpae89Yzlis8RJ6vvlthpH0+aX578oV5aTwzhpwpUEZOl+rGIrY5Dwert2eDPNAV3YsdeTj5vzUiuC1K8ImrnUOBcBP2YUMRjppIoaEZMlgfw+pNIgD4Znv39jyxp6MkMNQyKnM/d7jcmC0jU0H3LzL9OdDoNsX9Gt7KFlO+vYZT1QfnUHuQcbn5ZP6UlZJHhAhAG42icZM+M0TRRwCQ4OhvObmETB4eja1E/kQqUYJAl4uvt7WQJcNHqNWqKfCJ4iKGRvHj2Cus0OxINvTIpA4WOc4kwF0lcJ4kZkFbMJmpQHzC8qqStY0R5a524F4dH+O2j78CygS/NhWg+zK7DWUFh7qiewwXqx98usP+7YRAvraPpAhzcX44RqSnAcMbLpnGYup/4lW7DuHz7QrMH9n0DL/0iLRfD/lfMTIfZdIFUzg+qSQxIm7/nxP/CBNH9zLOGPLo3UBYFTYZU6lY24DWa79Bgfxn+qv5KkGK9I= X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1522; 20:p6coeyRfQcRViRtFjt66UZGhIncEqQ4ND0SwRLMAC0CJgHJmcrMkZyrZWK9UKYR0uKaaUFr4XenBAUDtPAWtdEcDqVOVGbfWhWqJYQ+FZtnPAp4oSgnuuNZK3jmRVPzScTpW08WGKH19X5MraQ5lp0ENXro1iUo+lHjGsMz01omra1sGinKQJvZk7Lj3VAZToEiFCzieOOGCrmnFJgnIOb/YVFlpWX8mstFOblYZnOGU1m/rg+IH1dqj/ppecBqZuAC52DOth9GurnsBYWaMxGS3SBmiHhoulrsMn4P5eHHTrTminHTH7UwFs0PxWkhUmNlyaR39zOXNyAObviuJnK9XOCfYjUspeyGweecJXkdOqquN/Je+JjJffZt4ZhsSqR5sfeScTXPrwMEx9ByRTQcKq+ZXc6bRFI8m6ijAm7b6eLzfWKS8U1FjvHZL5In4EMiG6zonwNdDgHevyDu4x1xfaBKAATqpGGnb4O1i5NW4pzjGKgmNDM+2BzrepyHk X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(236129657087228); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(13018025)(8121501046)(5005006)(13016025)(10201501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(6041248)(20161123562025)(20161123564025)(20161123555025)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR07MB1522; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR07MB1522; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR07MB1522; 4:YJrTG4bICI1kF3sDmKpuxNW4WCaim72a/34sVXPOkI?= =?us-ascii?Q?ZFnpItKsdi1lD7lQOCI5lwgOzB4gU6RzVQiKa38tceUAzY2p9mQ8dz9MOnDr?= =?us-ascii?Q?5QSa6ocKqH2u6PmlJealpkNdxcKKz/fKqXBaUgaxh9EauTbJDCeUlTuO8URR?= =?us-ascii?Q?R5sz//xrd2pIXg5z2wt8aKXJpGgALfEXnuSTQbsDVU3ah9qtiwOW+6YTSViY?= =?us-ascii?Q?KMkivohHik9yRUm0sTzPFhawXZdXaryMqg++a6fGnGf6NDn1c676l9QieiFK?= =?us-ascii?Q?rI+tQk3EK4B4PlTSXR5ZTwTBwhfytYA+UmUdC/KoIJPbjfksA27GY3RC7hbb?= =?us-ascii?Q?i7EJmoZwJ7h6MRxONyYBNGpUgb/eLeK/hTkVVkKEO0iRikhBvnXCgWvB0Y0F?= =?us-ascii?Q?0KG50IFocKbVMcQIu3MFnCecxi6Phdu4oXrCLhRXdXAnDwM9P64Hpe0UBQuq?= =?us-ascii?Q?4vZuVpsDJ6jV3IZSOZXF7shtKdw/s8KZAkWltLndc0XvzpszvozGEnaYPYez?= =?us-ascii?Q?nEY4I81p0gqvpdp8XT+kmq7H9vVcdWgCLfUJdEkksPdSjBGcoAq9WbNelMDH?= =?us-ascii?Q?Y3cao2YZVN467Y/dorGynA3oBeBQ1/V7Fk+8EVPeZANNiDivKmHs+RqzeOQg?= =?us-ascii?Q?kFO/ybYAp+IcF5Uq797eqczuQ7yEQjvFYzDtkvIzGswZaONcyC4YOmjuL+TK?= =?us-ascii?Q?eG5q7nfGB43WrHFcyGrh3LSc+JwKxTWhuWyZps7yMnkQd/ceOG0hQFpSx0Ps?= =?us-ascii?Q?QHyyMqAtih90SqQ5EGT6ydCb+2JhpV0qtCB0u3HZDK8YomsiK8OmrWozSCDv?= =?us-ascii?Q?SQAa+CMZGfR6trREV1rheyOny8FJJXggGK/pIx8k7n7i3OPqAbuHmUem3jY+?= =?us-ascii?Q?zNZhazVNWdMCPPe4vbGqGEy9qZUhZlMd8m6sMEayN8/B40gDtl4DOMTgeDFu?= =?us-ascii?Q?AW/vaVFEgsbH9zNTOyCZyp+0zlDDbMcaf3qRXaYCykfkfehI4Iemfvdmq2Hc?= =?us-ascii?Q?XVAHuAfZ5HI4wz1LyGgjSLaHaQwzt6ObSqXK6uUy+Kiqo63b9MCudtrXu9R7?= =?us-ascii?Q?nQiCVpCjPGOsHBWUSYfYjAt4jkqCzzW93jBhlKE/s1yqzceE4WmRh5yEw49b?= =?us-ascii?Q?03CiNkEUrdALKL0M6nRxn+3k/vHxsyaxuiSN8GoEqnQOl814OwBa8rVEnbVA?= =?us-ascii?Q?INHc8GrJzo9o0aSgHK57oMZb5uRhEEIPH082g7lzQuCgx1CxVvC8VUgw=3D?= =?us-ascii?Q?=3D?= X-Forefront-PRVS: 03569407CC X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR07MB1522; 23:LfKjFMx56XHDKy9isVtov5uFDcLIKlCMz9919/hGJ?= =?us-ascii?Q?KI8MAk+8t32+kC02ulfQ4RbXWy5skmapG1ExzC+RDurwFTUMDejMTQYHxd6M?= =?us-ascii?Q?Cm0Wux4b4Ydgeiw2LvE8aqt4Rodv2j1f0CJsV/Yf4zsxdIPLViPouAYb3gdQ?= =?us-ascii?Q?sRk8jILGlBLLQtUJkVKT7hJxpxFf+ux9JnfIGooEIqVtpFMAvH1yjdS5ya3g?= =?us-ascii?Q?PUhYomcIyBn2AzDZMj6loUwLoSA6udffuETJrSN/vVSk/QV44B5fCoqxU2qJ?= =?us-ascii?Q?T+UkrqmFJRdYUHxwibtl+dOjlsDtHcoBUPmDqwusrHkoPlCA1M1hzxNmnCwZ?= =?us-ascii?Q?h70J35rCO/f8neblqRsTyuoq6HOTjAczo9GVlhaCLrGVf+Qlzxw/JB4WW17U?= =?us-ascii?Q?LAz1U8vqDtRCl9RvJ+ZfqJffoahhtT9AO+77W80fzfYwK7okfthjrQb8HOFS?= =?us-ascii?Q?Lqe6xnCzvSNSb2l0a/iN0oaSzzA9XnajKFySFF9G4yfkPSYUr+nXj42euFey?= =?us-ascii?Q?lzTb6iC8kL8GievLn1Lldv+tW4QsF1+wH/htmltymKjyruCla6LY5YsgAoXo?= =?us-ascii?Q?dlt4DfP9lKQdCkQji4UA6kMRvRx4kmEU1/8dqMqJ+7A0QwWIIv54d5w6O5/V?= =?us-ascii?Q?TUdKMGGZIeW6xsO9DknXpyxTAq+Tgv3cuSf9V7yRe/LA1oXYYZGMade8B3oh?= =?us-ascii?Q?PPGXD61/YdovkHpkCtTRjCcFA9jSU71xEEGP9n9qKPnBt+vEfDPel6ifzCtG?= =?us-ascii?Q?uUco9e9/Hp4fwceBKVg4lL8huMOcsqwiEmaIDncAqpzKUPbTisW+0lLQPBva?= =?us-ascii?Q?yXyxfStANtJKQxEDqFoMqol2MO15sYi3KE9Ixn/TR4uVShp0w+1Ch2yk8ATu?= =?us-ascii?Q?jiBtHtV83hUhcIb1iQrFwL8gvTjrOSaOd2zTeGju9gQFS5zpCeVVafsHPynS?= =?us-ascii?Q?z1UHbSFsKCms8ZpnfzvkOiGIK2TI1/igquZRM0RA5itkglQgwz+2mAIsLfak?= =?us-ascii?Q?N2eSIU9Fg7ZXUPaN2oEfEuVM8hfE6A2As8ByEqWy4i/mkRqEFJCyt3wvgVjD?= =?us-ascii?Q?loWoyo=3D?= X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR07MB1522; 6:QxHu3bT0HaBo9rDveoA1YvnsUsbydx7hif/UGzLzhQ?= =?us-ascii?Q?mEaOVt1l7m+J4p1MH4RLqcLgmQorrL0bxOVmt9O5GNPLeiO9UpcwyoWHj5IU?= =?us-ascii?Q?Uu8rl7Eyx57dKGJaFrIxhB7Iu0wFINZaykaAexjMoAiwhgR2jNQAJDWMN7aY?= =?us-ascii?Q?wvwGE/OQf/4liw+6UfDPcWMEiTMSANU/Uwic93G94ntm5ODzbZ2NHSgJBRpq?= =?us-ascii?Q?sV+8oBvSILeNtJrDel001UoqnZLnYt9Dt60bIYjqKoPzzJ66O816WSM2mCEW?= =?us-ascii?Q?uVCRPvNJY6TKwCys5ZmYeDz2zhiJHJzG0pocmLq/fRo5NC0Ou+zMBFfdp9ta?= =?us-ascii?Q?/ZFjFrltMkZK8L6FWFxh17Oi4nKu9UbnNYRhkUCsgCEz5ET+oujyfGWQ9UcB?= =?us-ascii?Q?fhFJdMuPUebWlokzrgHYWVXiIu39+jKYi9xcHvg9UX3CxXGT1PtkqPTWcYfz?= =?us-ascii?Q?Tv7I1x/vhwr9xMCmzoGltrWr4bOUuVgwd39aSRx55bRcojRylwOd9kWQvFR5?= =?us-ascii?Q?ps/4+CxX5ANZfq4VOWCHM0cJMrN5ycA01opi1UkKJlQAEGOaVvOSBSdJXu61?= =?us-ascii?Q?Q9EImwHv1sjsJroD/uquUM7Po91KGcMOoDJ0id0gXUxgsv3H9ApwEX12kpsP?= =?us-ascii?Q?V04JcGNfCsxziDJYt9Ufmrv3nKr2wI/QnFnJ/gzw7BqtQ4fNQVmmK+XJwj0Y?= =?us-ascii?Q?kiD2VUlbMElvFOTKOFP5zMwsYiU12jpiTDEWATI3tVQRljyMu0gHCit/Sk/Z?= =?us-ascii?Q?2zex76nOJkdkSNY0EHu/lwCxX9I6q8Zj7x/gyXMMuZAr1jOsK51kA28onUlz?= =?us-ascii?Q?TUZACT1d06F2AjjDDWEGtx6jKmMIC8MZZY0bfAEuiAWorTc3OtLxdC5PFdTy?= =?us-ascii?Q?bvPBLxWDGmdcNdeX5Sel+WT3ELxzaKR5qcy+vQDGCuNf3SNgQRVLsIReCtiU?= =?us-ascii?Q?yO0zn4rSXuIoPc3ddwQQ9esqi9gyotINDJuKcw4IRIRnCQbuhkM5r7vwx31S?= =?us-ascii?Q?w=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1522; 5:ykvCBICy2fd5/RkIoGShSsi53QyVme8zxkprsieJ+xAwHDwg6LL4+gZziPzZedIhXrSMdq6dyr7HrqbC2EGM/Ii18TKR3BtlpnjE0hTRch+d5UIUYdvIlP4w4YUf6WIBjmMYJQkB5R9YZeMvRvaYNmT2xjcQlKIFFMzEiBwRF9jM1xFcAPmHN5yyThRED9XOHXz1VnGn5XhyzzHaHCCgl5rOpEYeYxOvtv5zb/yOXzz2OOD10PmSZbmdqSwq126EqbuJSg+rbSxNs1SAnrPOQnnJF6wBjKpyM11dL8VtGCr8Ji9Gtc4DOF8iaZNF7aQgPlyC1jTfgG+hebwtF+YCwx3i+Dd6tpi9pEo1dBuvjYDuDNJwnw3Y4FSmQVnnwwALCt5R4i48qImRHC3SMIG1oNCRx+7LITSnIXhup8cXEQGspDtvjfi03+uHLTNUsUOQlQheqx+J0U9kejTVCWRDTrK3wjL+vjjjrB/X6RWHb4HPDJ+T8N1ar7T38nLH4Dlm; 24:QOi8LDDTmZeSubEuWKt1jM2xrFqPXf/pe3NoX4Mz90LGVwmeTGNGzU/oXIUHq6gu/hI8zS2rYU9nIeAY8dxK5WGKjAJJLbtxLDh3gyxkUH0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1522; 7:VgzUAPOQXGukyPYrVQzMVvpN3MOJ2hN7IsLirKEZF7wxwsao+EHSUlPvAU3Q1SRwyhKu6XNQJhflgtFEuZ3hYJh2MPhCQaI88Sr3DpGyVHCJGpneN1lhb5ZqRFQayzfK5uMSqkPHXc5XH0EzHvvfpSaWUt8YlQAnZwh18t+5ktalF4iIQ6G8XAEeQCt3XRkVdj81cJ+s+6vgekrBwtG1ys1vVxc/G8w9IM5ntMmyfbP8CdxO4Dw7pMcB035QJ0ovWNZHmVocX7H68Akj454gjX9eWYQn/PS48ijZpqn+6EeVX/0FPGoj6baHc1pBaPxkHUdpFGFyRkCHDhAH0aypWMszU1eHDEY4wIzKr5k1NZFM3OUtuit242219e3mrU7jKA9qg/H8EZbaIUvayMuXjsRPU33BIsh2D4TdGRIGULUN2iYeqpFCVTTN8jddwbEJszvfsPKPI0lsm6ZSXT0Ye+ipGqsbhRqXUIMRc0D4lGAZzRT0rpcdR86CggsmdfmklabWtU/QMxomSsx9FV1Xtnx+H4Qb+nbBPOWfwg0K1PxnNyW5z8JnKCnxgWnmxPEjHisTaiFYZAw/ouby4wBXu9YJyD5L2xUBuojeW83UUheIbZ0Hw1mb5GyUeLaaeJOAjeZwQBneRYHrroZ1ioHgZvT4dFGZy17SZhhSN7iUX+dYJz8CRmNLS6u5BasE4ydUaH3EhOIQD2iULC6bracb/p06cw79u9NSkUNoUAkjeNrtyHP3HEhv72cLKrNlaS9JnGkso8fRlIAFwFF5YyQklMRGdJAlDB2rVfypCOAjQgU= X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2017 07:31:50.9668 (UTC) X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR07MB1522 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 Make some names more generic as they will be used by iWARP too. Signed-off-by: Michal Kalderon Signed-off-by: Yuval Mintz Signed-off-by: Ariel Elior --- drivers/net/ethernet/qlogic/qed/qed.h | 2 +- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 29 ++++++++++++++--------------- include/linux/qed/qed_ll2_if.h | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h index 22e1171..fd8cd5e 100644 --- a/drivers/net/ethernet/qlogic/qed/qed.h +++ b/drivers/net/ethernet/qlogic/qed/qed.h @@ -779,7 +779,7 @@ static inline u8 qed_concrete_to_sw_fid(struct qed_dev *cdev, } #define PURE_LB_TC 8 -#define OOO_LB_TC 9 +#define PKT_LB_TC 9 int qed_configure_vport_wfq(struct qed_dev *cdev, u16 vp_id, u32 rate); void qed_configure_vp_wfq_on_link_change(struct qed_dev *cdev, diff --git a/drivers/net/ethernet/qlogic/qed/qed_ll2.c b/drivers/net/ethernet/qlogic/qed/qed_ll2.c index be66f19..e235fb2 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_ll2.c +++ b/drivers/net/ethernet/qlogic/qed/qed_ll2.c @@ -309,7 +309,7 @@ static void qed_ll2_txq_flush(struct qed_hwfn *p_hwfn, u8 connection_handle) list_del(&p_pkt->list_entry); b_last_packet = list_empty(&p_tx->active_descq); list_add_tail(&p_pkt->list_entry, &p_tx->free_descq); - if (p_ll2_conn->input.conn_type == QED_LL2_TYPE_ISCSI_OOO) { + if (p_ll2_conn->input.conn_type == QED_LL2_TYPE_OOO) { struct qed_ooo_buffer *p_buffer; p_buffer = (struct qed_ooo_buffer *)p_pkt->cookie; @@ -532,7 +532,7 @@ static void qed_ll2_rxq_flush(struct qed_hwfn *p_hwfn, u8 connection_handle) list_move_tail(&p_pkt->list_entry, &p_rx->free_descq); - if (p_ll2_conn->input.conn_type == QED_LL2_TYPE_ISCSI_OOO) { + if (p_ll2_conn->input.conn_type == QED_LL2_TYPE_OOO) { struct qed_ooo_buffer *p_buffer; p_buffer = (struct qed_ooo_buffer *)p_pkt->cookie; @@ -893,8 +893,7 @@ static int qed_sp_ll2_rx_queue_start(struct qed_hwfn *p_hwfn, p_ramrod->drop_ttl0_flg = p_ll2_conn->input.rx_drop_ttl0_flg; p_ramrod->inner_vlan_removal_en = p_ll2_conn->input.rx_vlan_removal_en; p_ramrod->queue_id = p_ll2_conn->queue_id; - p_ramrod->main_func_queue = (conn_type == QED_LL2_TYPE_ISCSI_OOO) ? 0 - : 1; + p_ramrod->main_func_queue = (conn_type == QED_LL2_TYPE_OOO) ? 0 : 1; if ((IS_MF_DEFAULT(p_hwfn) || IS_MF_SI(p_hwfn)) && p_ramrod->main_func_queue && (conn_type != QED_LL2_TYPE_ROCE)) { @@ -924,7 +923,7 @@ static int qed_sp_ll2_tx_queue_start(struct qed_hwfn *p_hwfn, if (!QED_LL2_TX_REGISTERED(p_ll2_conn)) return 0; - if (p_ll2_conn->input.conn_type == QED_LL2_TYPE_ISCSI_OOO) + if (p_ll2_conn->input.conn_type == QED_LL2_TYPE_OOO) p_ll2_conn->tx_stats_en = 0; else p_ll2_conn->tx_stats_en = 1; @@ -955,10 +954,10 @@ static int qed_sp_ll2_tx_queue_start(struct qed_hwfn *p_hwfn, p_ramrod->pbl_size = cpu_to_le16(pbl_size); switch (p_ll2_conn->input.tx_tc) { - case LB_TC: + case PURE_LB_TC: pq_id = qed_get_cm_pq_idx(p_hwfn, PQ_FLAGS_LB); break; - case OOO_LB_TC: + case PKT_LB_TC: pq_id = qed_get_cm_pq_idx(p_hwfn, PQ_FLAGS_OOO); break; default: @@ -973,7 +972,7 @@ static int qed_sp_ll2_tx_queue_start(struct qed_hwfn *p_hwfn, p_ramrod->conn_type = PROTOCOLID_FCOE; break; case QED_LL2_TYPE_ISCSI: - case QED_LL2_TYPE_ISCSI_OOO: + case QED_LL2_TYPE_OOO: p_ramrod->conn_type = PROTOCOLID_ISCSI; break; case QED_LL2_TYPE_ROCE: @@ -1142,7 +1141,7 @@ static int qed_ll2_acquire_connection_tx(struct qed_hwfn *p_hwfn, u16 buf_idx; int rc = 0; - if (p_ll2_info->input.conn_type != QED_LL2_TYPE_ISCSI_OOO) + if (p_ll2_info->input.conn_type != QED_LL2_TYPE_OOO) return rc; /* Correct number of requested OOO buffers if needed */ @@ -1280,7 +1279,7 @@ int qed_ll2_acquire_connection(void *cxt, struct qed_ll2_acquire_data *data) goto q_allocate_fail; /* Register callbacks for the Rx/Tx queues */ - if (data->input.conn_type == QED_LL2_TYPE_ISCSI_OOO) { + if (data->input.conn_type == QED_LL2_TYPE_OOO) { comp_rx_cb = qed_ll2_lb_rxq_completion; comp_tx_cb = qed_ll2_lb_txq_completion; } else { @@ -1339,7 +1338,7 @@ static int qed_ll2_establish_connection_rx(struct qed_hwfn *p_hwfn, qed_ll2_establish_connection_ooo(struct qed_hwfn *p_hwfn, struct qed_ll2_info *p_ll2_conn) { - if (p_ll2_conn->input.conn_type != QED_LL2_TYPE_ISCSI_OOO) + if (p_ll2_conn->input.conn_type != QED_LL2_TYPE_OOO) return; qed_ooo_release_all_isles(p_hwfn, p_hwfn->p_ooo_info); @@ -1794,7 +1793,7 @@ int qed_ll2_terminate_connection(void *cxt, u8 connection_handle) qed_ll2_rxq_flush(p_hwfn, connection_handle); } - if (p_ll2_conn->input.conn_type == QED_LL2_TYPE_ISCSI_OOO) + if (p_ll2_conn->input.conn_type == QED_LL2_TYPE_OOO) qed_ooo_release_all_isles(p_hwfn, p_hwfn->p_ooo_info); if (p_ll2_conn->input.conn_type == QED_LL2_TYPE_FCOE) { @@ -1816,7 +1815,7 @@ static void qed_ll2_release_connection_ooo(struct qed_hwfn *p_hwfn, { struct qed_ooo_buffer *p_buffer; - if (p_ll2_conn->input.conn_type != QED_LL2_TYPE_ISCSI_OOO) + if (p_ll2_conn->input.conn_type != QED_LL2_TYPE_OOO) return; qed_ooo_release_all_isles(p_hwfn, p_hwfn->p_ooo_info); @@ -2063,7 +2062,7 @@ static void qed_ll2_set_conn_data(struct qed_dev *cdev, ll2_cbs.cookie = QED_LEADING_HWFN(cdev); if (lb) { - data->input.tx_tc = OOO_LB_TC; + data->input.tx_tc = PKT_LB_TC; data->input.tx_dest = QED_LL2_TX_DEST_LB; } else { data->input.tx_tc = 0; @@ -2080,7 +2079,7 @@ static int qed_ll2_start_ooo(struct qed_dev *cdev, int rc; qed_ll2_set_conn_data(cdev, &data, params, - QED_LL2_TYPE_ISCSI_OOO, handle, true); + QED_LL2_TYPE_OOO, handle, true); rc = qed_ll2_acquire_connection(hwfn, &data); if (rc) { diff --git a/include/linux/qed/qed_ll2_if.h b/include/linux/qed/qed_ll2_if.h index 5958b45e..c9c56bc 100644 --- a/include/linux/qed/qed_ll2_if.h +++ b/include/linux/qed/qed_ll2_if.h @@ -47,7 +47,7 @@ enum qed_ll2_conn_type { QED_LL2_TYPE_FCOE, QED_LL2_TYPE_ISCSI, QED_LL2_TYPE_TEST, - QED_LL2_TYPE_ISCSI_OOO, + QED_LL2_TYPE_OOO, QED_LL2_TYPE_RESERVED2, QED_LL2_TYPE_ROCE, QED_LL2_TYPE_RESERVED3,