Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751835AbdFFPDa (ORCPT ); Tue, 6 Jun 2017 11:03:30 -0400 Received: from mail-by2nam03on0042.outbound.protection.outlook.com ([104.47.42.42]:46368 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751437AbdFFPAr (ORCPT ); Tue, 6 Jun 2017 11:00:47 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; From: Ioana Radulescu To: CC: , , , , , , , , Subject: [PATCH 08/18] staging: fsl-dpaa2/eth: Always call napi_gro_receive() Date: Tue, 6 Jun 2017 10:00:31 -0500 Message-ID: <20170606150041.10955-9-ruxandra.radulescu@nxp.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170606150041.10955-1-ruxandra.radulescu@nxp.com> References: <20170606150041.10955-1-ruxandra.radulescu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131412348450150259;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(979002)(6009001)(336005)(39400400002)(39410400002)(39450400003)(39380400002)(39840400002)(39860400002)(39850400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(36756003)(76176999)(110136004)(8656002)(50986999)(54906002)(38730400002)(53936002)(86362001)(50466002)(48376002)(33646002)(189998001)(498600001)(106466001)(6666003)(2351001)(39060400002)(305945005)(6916009)(105606002)(2950100002)(7416002)(5660300001)(2906002)(5003940100001)(1076002)(77096006)(356003)(4326008)(104016004)(50226002)(81166006)(8676002)(8936002)(85426001)(47776003)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR0301MB0910;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;MLV:ovrnspm;A:1;MX:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD037;1:azk8YgNVBIOKmrBZLjC1bNBLIKlCriTt+IQNYnHbtErALnk4GwrSeyyAlwsgtDdTwC2GaimzMnoF7y9aJ/wnN9eFJk+ON+gdMAJDet3NC2P2j7xpDvF/4n0o235PIgYkMdKqk03dmSqtsgfovOEIMlO3tit17Li1eUvNsEDnjtXNeIIHzQI9IVXEyZZi31T9vYTfT3o3VyTUS+CM01ana5oN6yIFQEWfMWPmACPgCoPXIXB9jhtaS3/NG1IpU158OKxSoYMienEfDgDdI13vud9G2S2DKEu/DnLFboriV3W4EcnwWixX9/uPTqJoBfXpsYcfb17ofOuQ1tW9YM6ZD1CHke78dUey2gJhl1EsHNPP6n/4Ceng3ZozQUS2P6Eb+sGNdgwwatPMW6bWFZLY9sx6hUSBJQ3QebO20Fik5+lVJfSz4CI9wXPONg6tjdnRovtagu4iqa5fX9gQa6Hu2Fq2rUla/rhAHbTu85xacBMwZrEKIKDgvS63gNiu7mD024PfX7DQtIeAMZ9Xr3dJVlTUkdj0p3XnvWuTCKTkvfhQEDwKqhsltwQOvuhhkIL+5K7VC2SrLVZpSTj6TaCW8YawqEcgB4cJ9oW9iy83RFqpy6Q/OEarg7xwHnI57dSbhhg8QJnfB2iOLFC+EOX8YiZswFc/RD0+QBr4R/4rkiU9BoyQoZL2+25Hr56RgSLR MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM2PR0301MB0910: X-MS-Office365-Filtering-Correlation-Id: 2ae7a77b-0ddf-4f57-8c6b-08d4aceccedc X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131430075)(201703131517081);SRVR:DM2PR0301MB0910; X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0910;3:oKBBmtlUF+rNMKRUix2YrGBQicpRPadWhCZgeQUnsCCWVgEA2EEmhFK5d7ipzzDtA2/byLU54oSMSeA4Zj9YwnEKILkyx/pKJ8399Lbht7XTwRYw7+pHIyzS+U4UpvP8N8gBL7WKFFWgoOdlx/Eict7OtV0bWBdPdCCCurDmZHWLA9564PwU6zRT8Ooah2R0MfbR961lOBw7mDOnxcKZL098F0YuhtVKJGwL38j9FfLfo/gLR8+CPkdruvm21CwjaGUSTdkKkKcIX6MGbDS0nQUW7R1A++oLl1M/GR+0T1RqG8ZgZsrmaAIzN4DpRjxwgr8YHtDX+b8lHJcSKyMh/EGHXcIs9sfNcb/MD4u5BQlvL/05iVF/+rn6TXkON0PtCjrUPsnkhMv+GdO2oGX/upyLXKlSj26W78JKAxFYcQ0QWSR1qAVCVfbRZnUW30XF;25:HkaYhmSTeMTJKH27+Le86kTWzpqDedSWks43qjwpmCaO/4mgcOasTQgUn025enKLNv5SEc4A+dVVQ4M1SMuYkJV/or7ohll3eetor6UEyi3I6MdwGT+8s1zy/qWNJV3Xq1eMnx4A2w5MVua0ARYx6GobIil1Kcpr5PiDShcCriYotbLDrUTcPf1ZiQxQzNyNei+T23YFTiaZwv9/JYhN4vLaKhHS1yOT4Q2I7YfHCJLwufyJXlAMmTHueZaKF2O180PqjtazRkqvfmSFWPLflKCwRpjr6UJ6VMemhtQUy4N4VJirVE4oR+ND/1RJNxk/4807LgwNnCRAMeZYyhD93hTZd4fA992pZtXB3XzKAC+DQZw3v0aJDhT9FNLOgO1jtT9GCeSKKsZbxUEW8EblgsGRivNZTGupqg6EyvnGKXJtSrrUAjHaWpihXAopF5WyUQLu6u/y5ivGjtOJsm2fHGSRy0RonXJS9to9w4Y4sGc= X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0910;31:Ysfw/ZNCmoKJyKR1LmRCJO5maL3NmmoqVCFJ6UOfKdkn2lrR6cv0bQ2TqQ4K7Afs2VcbNgTy57Q+za2cOoprU9M8lnmoMdp9vjzZxvCzIaRI0cc477mJm7SGFpLxyCDZrZYXBVqZIyrOmlWhzzJFDKS/smQyZ6gDGuUgKOxL5p5Tjnq2QJAJwBMZunKq9ZnEbJlHdUWYrlpoB54t8QdzAYFn6eUQ+jdL/W7dLfl7cLyr2ZY7yer5/S9DXQII7ut7R/lBSCfDGmoL8RZkBTf0UQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(13018025)(13016025)(8121501046)(5005006)(93006095)(93001095)(3002001)(100000703101)(100105400095)(10201501046)(6055026)(6096035)(20161123565025)(20161123556025)(20161123559100)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123561025)(20161123563025)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:DM2PR0301MB0910;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:DM2PR0301MB0910; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR0301MB0910;4:lVO0vzg0f8ncRj6iwcUY4NV9RR8I6BqHbXArA4rN?= =?us-ascii?Q?ozvTKM26FrTPR3NEoHnsqijC0VdC/DQ/9er95/P+hYIkR3g3GUxeqC6lMS8f?= =?us-ascii?Q?7Oy2gcmA5aqU6uVEnOU/2cu53yiE91JgQWN0uUXlso2jKUBSWvucxvGOr9ZS?= =?us-ascii?Q?gYdPfkcKTAFdi2bAwEEY9Tmh2j2tdubgHDnKyGJW0lPjCIK3Eo1FAez6byI9?= =?us-ascii?Q?fjVWyN373iqkavB3ZBlGUU07FxJpOeHvXR7g5q9UvUwTKlCWDAq63cjlFKSl?= =?us-ascii?Q?WRf4U0bFd6S58lnCTFLfumB+yNrFXYSGfkhK40B1brN3TgGBakVsRdrP2aC/?= =?us-ascii?Q?fmfBUAkuYgjlfBkxVj9NTGMqb80xEeYilpBLaY1NljBUTT+XDkNB1dckRk7n?= =?us-ascii?Q?OGFlXmzWD8DCQtCdCj8+B8NA55x9nVOrCMLRP2xjDyOdzwdQ+UcLVyJ+OBmB?= =?us-ascii?Q?yhu/Qf3Q78bTzPVXmnLcqph6X77yRNXUxvBdKAF88WUNCCd+VEgY4dCp2oOM?= =?us-ascii?Q?h32d30zdIlTvUVkMkltvCTzEd3vHB+ISygzoZe6hH27vqblGrXbJ6e2Sk2We?= =?us-ascii?Q?PCHanBWIebDIJVq7GYvSoWwvOt+KxW4hvUelvPZiRduQ+vQz/1LiRVNzorJE?= =?us-ascii?Q?8ajIdOMLm2JpqKWxE7TOYMoo4jX7qhaO3cuMXhAnyTLlS36S0awjWaHXnpRJ?= =?us-ascii?Q?qQOHQtbUJ8iUpGO1RvWD3mRB+M0gKGJNX/ouFNkp0D4Dxb+G6dWZ0Od+Zc+i?= =?us-ascii?Q?S99qOWeSsal/D6HEbylVxkj0TKzU6d1GqEyqPxmcqAF9CkuMtGLFaN4tjOvN?= =?us-ascii?Q?5rDeuYavuKXD0Kkd63RDaevT0hAl9TzGHj1mlacjAXBmeRGaJnwKlmvDAmBK?= =?us-ascii?Q?VIT6W+l7IYJjWZjpWNU1d25+WalhcKZoXkHl3uGQu/gtA9g19On5ElIzqruE?= =?us-ascii?Q?zTRG4XRQePczj5mrFLSYusWj0LTpXLYtIHru6T4nePEH6CoCAGFaNAcAcM+o?= =?us-ascii?Q?y1bv/aECQM5bitEfdm1/Xk3+DIqtbSELHwR5sUcvu761z2lyUmQgOTTOwmP3?= =?us-ascii?Q?FRwUbXDimCChNt0ZAIIVYfx+FD1pZI17W4tL4eJ3qE1N6yNNmWWhyaKBR8TE?= =?us-ascii?Q?2crYcByrEjNxrO5W6kyr5/dNEWyg0BfU9QDMT0YqXiLgoFY4Ir8QCZSoQK4j?= =?us-ascii?Q?Coj8wY0T/xl85o9PfyDCUOi9j5VedKnNtirCv2XfvZz5617VMK/PQmSYD3yF?= =?us-ascii?Q?k++H4EfILblXep6RrzTv4HLJVKWqM262bh+T82tw?= X-Forefront-PRVS: 033054F29A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR0301MB0910;23:CvjW6G5eNZxCfEcv2SZK5MLLZBzuYjjSz1n4LWz?= =?us-ascii?Q?H6oS0U+CwAF92eGNzKYlV+IcULPD++KmTz6cHM2Yq6rLCMYk3BDt5I+TFFdl?= =?us-ascii?Q?jEuyYTBcuS0dEOAynHiomBuChh0CQS4asRDv/u1helsjDsNNoI7isT6Br2hG?= =?us-ascii?Q?aWkVuV5wHWcTfIkbAqiL+dcCA6ig683PYtisuHHUawoOn9jZKewLODJkvwCn?= =?us-ascii?Q?q90U4rayJc81owEFqf9rzToswHCTs/jejeOQ2z0z4PGXLDhbR5PJiODdTl2B?= =?us-ascii?Q?N89oNbp0Jd+fqo4Duyx8ofjG8V3UYvdiHMyPOKlYBAXaIWeZWStyuZzaCmjL?= =?us-ascii?Q?z/3rS+COuqX79foHYgzPPmF2uY4AaE3G85uq3TZrTaWEXHf647d5g0gHl29A?= =?us-ascii?Q?JYO/+e8z8V38/32L2rs8HHJ2YuJpjyV8n8Ojr1PwHCRRM+kH2Ns0kphKiSYK?= =?us-ascii?Q?SApowvos5JDevnlYTihbcbwp4pwJFGLwFS9FWb2cdY0p2xxRspE1ENbluP7J?= =?us-ascii?Q?HjpF8qmOEidraQCTadGZo0UpmhF30XshFuD3SV1/zuFB2P5Qwhy9YBLGBG10?= =?us-ascii?Q?W8Em0UkVXU2sdhtZ9A3becEpbfpUy7T7/gkou5pgD3lnZ4vo9ESF0gjKm9ej?= =?us-ascii?Q?Q/nwkV0NU17ps5Chv6MDWO8PLXURw5VEVTwfBROueX1x8q4PYsN8CRMAeFF0?= =?us-ascii?Q?Pa31CrDTt8HyMuJRHnS0TROa9SJhttnhQU7Dqg4qVLwXUZZeAOyMfUi6q4ZZ?= =?us-ascii?Q?g0MoraDOd3plssf01Q1P5Bde2bt2fH9iW0l3R8yd1tGTQ8xVeUprOHacWOrQ?= =?us-ascii?Q?XJ7dgEFRvzrSfBJRn/WX7tB8StpJtAgOJUl40au3+j6w6h3/9ZcC1OiFqBFt?= =?us-ascii?Q?r0N160+amPnE8tZwm2sLteC9fh5vNEzhQF1KK0Qjz6G2Vq+NcgglonLoU2vR?= =?us-ascii?Q?ZO0D/Yi7AReePmwY3/UnRdQZa88pdPqelTylaOWL1zo17nPGEW22sVfgAzgu?= =?us-ascii?Q?n6Acxay7BAgOD+66fcgcvPnuGVoza49YZitnByqinVLTFSOhhBr3+bsFF8a3?= =?us-ascii?Q?zTUKnfdmIkp+23EJdAvoFmViziitznkp9JPgmbtQAXlhdjbnE4YvXe4LRAh+?= =?us-ascii?Q?lKAcUpVIJfNV3ALcJwmpnN9L2Vhuckp/nygCCVAaTg58Jn90QzBxh9rlmvst?= =?us-ascii?Q?ExI1YUaVzMq1nxDWwwykJOs7gc8ZijqFvV2qOVi3CIrIEj3T0yIkeEKyL25K?= =?us-ascii?Q?L4Eq4Vd/7B5yWGtGznuU3bncWTuoJ0D4oGvwg3K/JupnaOJ9dE015QSqyP1c?= =?us-ascii?Q?RUov0fa6YIv/TSNtYrHYwIbhucs88fLkWoqYNyISZvFTxjpgt9fo0a5lGC6S?= =?us-ascii?Q?QG/uyYi8lblEDVFa0UAeluGvCwxxTLBZa4NMf/2R68bnD6rEa?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0910;6:bz4OrHhgaf0zUraLpLzvjKDa/Ps+mZ11e/49PaMmHRrY1Rne1wIJpF2CzuAPDKZhqNqM7zOGbmZqEGCGhy1lHUWxQfgop3AgtreSliRGOaEc087uVT9WN24+I4QEm5zVKgGMkNCFSq8Qv4XWIuv7DjKUsLBegLb0SsFzlMpyNT/Uyr8WjMo+f/lXs3p0iJ0kRsfj2iKt23wn6hbGp76hjKhIxHebCksmxalz7DxxqrS4Kkz54HeliSdFILBG1BmYYLyYSSA+iGH4wVUzJV9ymwI81ze3mA2YQ8vc/S+XYoCN8/i7xE81ErEzpwIH2tQc2j44nneVXNUDIdhe8Cwx6IDcI5FrPfVxindsABzvzS3LRxZNbYEilJdt0qeS83ZrzyYIY37RHCMLifp5iL+IsoPTzV+xlIjU4HJGlUH0MGygr1VBszy1t4lD9XxjADDiBYBfATVvf3sCRDyI41Jw8DPiVD94+SwSGITknT1qTvy5q1uG3FjdiagtpjiktbwXJ98BkkcdKrFSSxA/lWMNOg== X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0910;5:rmhPuH/4JuESOVhb1ryz9LdWgkTml6CKi2b7kZDFTIVdQ3/b6R03h9FXYGVzrZX5kMXxODYN3pBAaV4F8BLQccbW9p1XSilOBepKjSajfUgsesyMNJl6y6ruRt3qZKi8T+9aN31iPMhho3EW3LQAUdo9aK/WbIF2UWTlN6w6vZXhXLAEFv52+n07/hFuFWHR+wjkZo19oHPRdpNGgrrRkIscgTROS6STQ5bqG/HZ4c2ycTnfYHxTbgXzD35R1wWde93wUyftc4dzGxsuJ+RMoYyWMVGXPBnc+Ipw/1AqIzuCnM0mLtHukZk4NwryK/N37TGCdu5Dq9aC5rWdM8cf/h7R/4ks+mrWUy66eN6wLBiy27ABSOtxfco4pVSJggapJvO0vHvaNaGzJF2XZ0jV+epJa2GzDykMBx+UAzDN/tOYv07YfnbBIdJ3vt0G7jD/9A6OHcboXSpuu6b8cloYzl9aTNrstxd18YZ9lNWk3K0ct/XboGj8RMPrXRgM+RlwVl7aKBJcbnFTo/lrefib+g==;24:0QoQTXkFxolFN0vBUsyY3OPWTjWgw5gmnP0NNykqXIiXaTZN1Vw/jm6cPtO3j3B9aVgyftOEtmg32pfjp5XawVFnRx1hHMMu93bLK9b06lE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0910;7:1Q0IWiUmHBuc75Mm5wrwb85QmFFVK7/ZGkojOlZbOeupopwRwGPMcF4KRo47ClgrLvAZ0y+XFu+KJe/MESPj0PJN10Bo64BHe1kD58xzvcmv8Hoc91AMPJu5gJIEmPJRMGsxuIC32WpMWkc1gU+QKXxC9yciH+TdxcYJjvRyAKFcI9mg52CuyIbuRoLm9HMM5XsVloVx5mrCVoLIHA5IAnxcLFafs27w3xN5tUwDZRMt5XKyBaoPJS71bHhJvlLgGK+MbtV99VEkkYkYlcIQgTkKg/abwIeHkn1vj1p4Fp39oOWHdHi1VkseJqzcYftgRxVe7qCeCZF9giHeG1lpFg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2017 15:00:44.7030 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0910 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 884 Lines: 27 The function itself checks whether GRO support is enabled and acts accordingly, so we don't need to verify it in the driver as well. Signed-off-by: Ioana Radulescu --- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c index 57628cd3ecf2..d3ec384c7364 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c @@ -273,10 +273,7 @@ static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv, percpu_stats->rx_packets++; percpu_stats->rx_bytes += dpaa2_fd_get_len(fd); - if (priv->net_dev->features & NETIF_F_GRO) - napi_gro_receive(napi, skb); - else - netif_receive_skb(skb); + napi_gro_receive(napi, skb); return; -- 2.11.0