Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/806716/?format=api
{ "id": 806716, "url": "http://patchwork.ozlabs.org/api/patches/806716/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/acf3a0f9bf9ed8fb29723abc6a13a78ab615d48d.1503945861.git.pavel.belous@aquantia.com/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<acf3a0f9bf9ed8fb29723abc6a13a78ab615d48d.1503945861.git.pavel.belous@aquantia.com>", "list_archive_url": null, "date": "2017-08-28T18:52:08", "name": "[net,v2,1/6] net:ethernet:aquantia: Extra spinlocks removed.", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "6b2a36257228c027f664009b169769498f9a5787", "submitter": { "id": 70953, "url": "http://patchwork.ozlabs.org/api/people/70953/?format=api", "name": "Pavel Belous", "email": "Pavel.Belous@aquantia.com" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/acf3a0f9bf9ed8fb29723abc6a13a78ab615d48d.1503945861.git.pavel.belous@aquantia.com/mbox/", "series": [ { "id": 240, "url": "http://patchwork.ozlabs.org/api/series/240/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=240", "date": "2017-08-28T18:52:07", "name": "net:ethernet:aquantia: Atlantic driver Update 2017-08-23", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/240/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/806716/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806716/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming@ozlabs.org", "Delivered-To": "patchwork-incoming@ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=AQUANTIA1COM.onmicrosoft.com\n\theader.i=@AQUANTIA1COM.onmicrosoft.com header.b=\"VWnUxx/Y\"; \n\tdkim-atps=neutral", "spf=none (sender IP is )\n\tsmtp.mailfrom=Pavel.Belous@aquantia.com; " ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xh19q5fXCz9s9Y\n\tfor <patchwork-incoming@ozlabs.org>;\n\tTue, 29 Aug 2017 04:53:03 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751192AbdH1SxC (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tMon, 28 Aug 2017 14:53:02 -0400", "from mail-sn1nam01on0080.outbound.protection.outlook.com\n\t([104.47.32.80]:58048\n\t\"EHLO NAM01-SN1-obe.outbound.protection.outlook.com\"\n\trhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP\n\tid S1751341AbdH1SxA (ORCPT <rfc822;netdev@vger.kernel.org>);\n\tMon, 28 Aug 2017 14:53:00 -0400", "from atltest07.rdc.aquantia.com (83.149.43.106) by\n\tCY1PR07MB2554.namprd07.prod.outlook.com (10.167.16.21) with Microsoft\n\tSMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id\n\t15.1.1385.9; Mon, 28 Aug 2017 18:52:52 +0000" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version;\n\tbh=doD11n1PuEWuQ3l8V6rQy0IZ0TLFX31PxcOmkdxxfwo=;\n\tb=VWnUxx/YrTmSo9108Dui5cqoxL/IO3FyJ361XDdLq0hIh7HySbxe5gEjn5OMgIPqClqm736GRIbpXb7+RY3ydiiGmnDUTFNYlcEuEXIF8ytsfF8Xh/Q/gWZngs2nUJmqDrONOT8NxwyvFK+UivaCf3CuYAvAchC5Vi7mVzUhdqE=", "From": "Pavel Belous <Pavel.Belous@aquantia.com>", "To": "\"David S . Miller\" <davem@davemloft.net>", "Cc": "netdev@vger.kernel.org, David Arcari <darcari@redhat.com>,\n\tIgor Russkikh <Igor.Russkikh@aquantia.com>,\n\tNadezhda Krupnina <Nadezhda.Krupnina@aquantia.com>,\n\tSimon Edelhaus <simon.edelhaus@aquantia.com>,\n\tPavel Belous <pavel.belous@aquantia.com>,\n\tPavel Belous <Pavel.Belous@aquantia.com>", "Subject": "[PATCH net v2 1/6] net:ethernet:aquantia: Extra spinlocks removed.", "Date": "Mon, 28 Aug 2017 21:52:08 +0300", "Message-Id": "<acf3a0f9bf9ed8fb29723abc6a13a78ab615d48d.1503945861.git.pavel.belous@aquantia.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<cover.1503945861.git.pavel.belous@aquantia.com>", "References": "<cover.1503945861.git.pavel.belous@aquantia.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[83.149.43.106]", "X-ClientProxiedBy": "HE1PR0202CA0019.eurprd02.prod.outlook.com (10.168.182.29)\n\tTo CY1PR07MB2554.namprd07.prod.outlook.com (10.167.16.21)", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "032c0fd8-28ab-4911-53dd-08d4ee4600ad", "X-Microsoft-Antispam": "UriScan:; BCL:0; PCL:0;\n\tRULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);\n\tSRVR:CY1PR07MB2554; ", "X-Microsoft-Exchange-Diagnostics": [ "1; CY1PR07MB2554;\n\t3:M/11tJLbSZ9pASkN+PxZApu2pWxSQXUZk56Nu/nePMVPS7eyBFPUxZC+zAmS1eXXMofALDYnQkvEO42TaSqPgXeum8NpfMgK1K2/ksPXkUkZ67UChfmllTfBc/CGj2ALFkP7l9Wd6QOzsukZI+2cVlRjUUwuHb9q8QcnOI+P8ffMMUSrc2YQWudnUt0yVj938yn1vd1nC3yiO5CPnPX10i36k8bTdnZBTHcADtNXBu0VQ96PTwCsab0qUbxAS1Tl;\n\t25:Sc3fxxtVRzbSosvAelbUm88XoRUJXvayrhqu5slVdn/bChsKhSTmpPy6KjmQyF3adE5FF3hw4vHcCiGyKD1CACtpXM3fUgXpgJoJrwkcyOyMA3A8oAnLLGGALMNSCvF6kg424qSeG+TLLBPbtn3huxzBe+VDMTVPCYbCZIG5U6t8lYdHzOG7fwcR60zz585c87DTdRUe2w9WvGmMrctxvtF7q/VI0VUXoDgCFbEQNgtUtwh9oc+Ja+52vg0PSy/ngzfiebNbI4CYzif03zl5ySvodAmzjZrPWze1KUmx6Qq2gCxy393BAcGinuYXQOi6XspCFvtoH2fyJmzwaAQUXQ==;\n\t31:oThSPVtzzrC7lCpFbKGcQwFGd7OSp+ZZojmOiPFw99Y/QyUK8utFwzt5tRHyJdC2Yh+t5ZsTwD0oxIxVsxpcYXeIo17pkJdD2TrBzpymAyEutv1W6rxrDq3ceu95BKr+WnUa6fXWdv8++fRM+zfPT0NdpfMQuMuykijoFFpLgsRyn7QVO7HmUesCqGiZ8ePWSlKQr80UWWRV+LUlBSTyYT+axhTVbpXKelAUPjNNa1o=", "1; CY1PR07MB2554;\n\t20:tM8CBBqSE/UvV4nyXxHAiuU7wdCWpqR9+DntP3ZP6gI0OBkbxTqdcIsI0vqu9sjiSVUbWqEYe7T8cgfe/fAac3zqaI5sTkZNHZzLXgsj1hckI91xF1C79IDu5uo+RUsEs3OzK0mfPRMTOsP5M+eRIAdynj4hyoZ2xqwM6jR6hRVHf7D7xpw6au3ASVqrCQclyR1HHMU94huF/X6Gbn/Ll+oATEuKDUn3FiExbvZowyY+r68eBcCssp85NuKQn8GOeOtlOO4hjV1zDVpSBAUvp7Tf6JZ6MGMvuXyKlo+wCT4y1AZvZSvMt0w3ole1us3KJYz3Pmzl1tmQ+jl/R5evBFMgCVrj7ngjiScNJWGv8ZP8pGDy43jXzze8YyIKAaezr2csqgLQTQHT/ERPcB/LKsAaNDJLXxLzCUgxS2Td3Om+xMRu1lEh2ru5C5c8RnMES04xNTSFKlf4OLIRJRXfSzV8tOwJeg12VyiF9z2Z634di2sPwIlr4eDLrNCq0LSY;\n\t4:fORpYW5V60pfpQSNOnuSiu8T8QMpGTGw3x6K1qrsHr51xF3mrgDTHzLDKRjIwV80T6Wj0XcFy7K8z6tRsHJXVzfM4KmIB/+kiptoJkfZCmDPvEKbpcIlPmekZRrpBVeKJDVLcib4duNXMa696flFiZzAKwSvr6xwtV+8V3WDlylU09TKNZ9HKmiKQFAp6ycxh7SNpfh56XXygP2VctAubhoGCA8viugPRvJ9mDS6t7GSqjQMK0Zny7qbC3gfmkfN", "1; CY1PR07MB2554;\n\t23:fQfdXhZSUnos8UwiT3+dcL2p2Z8q+Od1vMQ09v/zesHM+qQHF9LJrjKqDycKlF9U249EDP1Rd+DVdlzZ5xtLPH+aYBJ323Ap226oYI35FUEN2PqAgrIFLH31ky6M22x9kBRu8Kd70tkpqAhJH9BSxrU+rgjFrgN3WkFqmj6UBAjxZvnfpe18PK+F1FSJ059R7YLYsOziMtbHnlWRGlzv5tU0rQyj3JarhPuAL5OxxuhHFCq75tmas/J867Pz44GQw5AE8QyA8P5LGSlzl8FJ+JXGP9y265pS2z2otGrr0Byrk0yrophfjMar218yxe9mdInxxacCGMFGr3I1IPKZ+A+fpJO6qdNYj+OVATSUxn9XVzfYwiSEuNLeskdJ47V8F7puRrMGRx5uF6MEOd/GEgWsLlAYWBt2KTPkzkd+fb1nUfoR4WCngjq8tmdgLj9KAVHdDbDhJMEHMhsMPcCodOiBBRZ8+Sax7SqpB8A89woQWXIoM0/Oo5BTmdX3oNEEfhjPp0F9vx4gn7/4WCEKM+C1yc2emNivGb9lj+9wsZ30nEYifccANsopCl4YrcVwpohZy1FjW7jjCacOEQNInw1dVoD4kLJ4vLmLhk/RuYJKB30NuPM6Oxq8H8IfBc/aA7qz+lObboSPM4WTnh3ZkrE1W+JzcghobmxQwGRm0qVkQb4hWx1PHXLviZbylnBy80DKWiXJbmA6DMtIR2kO6Dhr/WBKjWHDwJA8Nr4ACAj0shPWNwS97rPNJjPscDVPtEBu35w2+/o1t2Pb+jHnNpm+plvBzjli85Bz7qNvuIZfw/2TYdWmIKURgMAD4n3+Az+R9lhw2tMMZhBoccZCTBOibJ4UOV//GcmBrvF0ObFswy08+/ulPO+uhxreFySvpfhi0J9TYEmJo5ufxQ0p0uOp7ubvxVGM5frJVyDjSUyH+2MtveyZHmd97rJQbHVY5PrCmBKRWTYFQyKhPxGBjdi0Hq3keT9bawQZi2Yen08Y7g/PZy/3QiFlWVMy5rVjuzP/5RnJuIPoruo8F2PJgygXCu4GdApfnpjiL/De2MvtvdovdJPa7nT1PuOYXtimdQ7Ll8LqGLRVG4Sv9TQVq0RqcAIy9ZuU81oHb4Dr7CE=", "1; CY1PR07MB2554;\n\t6:8jEEg6O1xfbWsuYPllpbLo30H70qda8y7lXHzKv9l/fFWk4ElOJtZwROZ2Lb1jinWIzNWAcqHJw/qkTpF7BcpNqNzvfoSsQ0MbI1F4wOUSZHM3mO7D1qHgQ9txv/vpFGhqnFYvmPIlPhUvXCCrIGLl2b6Nwap9o23wr5vXL+XSWv7rrbcJ4FrMJ7Meg47GmhTn0kSa47S3U7eXQzsRjZeHxRyk/OHA071KJQeYoBSJuVVmOe5025FpzCD2mKFBDtMTAewlrE+poGOa20pt4ZYdYQbBMY7/6VC3ksrGGhZPEZAQx2fK1DqQ7s53Jj0W7HP7oO888TcY49tN/wuR2U0Q==;\n\t5:uTZBn6MzmkkxDjdlcCFNGu+5hMjywMOVG12Pcpg1MhD9JCZPs6tvC0B4IifQ5RcQ2/gQHwR59tmVGkBqlvZI+WfMoHhsr/k+6ot6Egz1meRM+ifW2Rfhuvj9wxburuhq9cSCUgr3yLZlcoY918Iy7Q==;\n\t24:aVuEpAuE5L+ma+o/GoHCqG+4a/1Ci/p9vSBHUACVIxa7VKsa4RSA8917qIk1d/MxwUOUT7udvbPnWKkOP2gvb4WS/3UVegn3Y69943MhRy0=;\n\t7:ko4b7kbCgNdSXdyABp6W9BjUUo/ZOgea2su65WrFAJVpZXbZtyScENFuOOZf0kSBNsE1utmZ+FE30AWTAGd2ZD0Fk8K8tXKq0iwXP+lwsENaP3948Hfjg5jAkBI3zLGozw5z5iZcQamv4O5bZVWQOOkAvlMkodixOTnnYtAvw4jiExX1q76qW1/ZdCVv5y4D5VAbnGLWv3U618yuSuto5u5qZr3HPArVrnbpJbPx0KE=" ], "X-MS-TrafficTypeDiagnostic": "CY1PR07MB2554:", "X-Exchange-Antispam-Report-Test": "UriScan:;", "X-Microsoft-Antispam-PRVS": "<CY1PR07MB25548F34065AE8BCC68C5981E19E0@CY1PR07MB2554.namprd07.prod.outlook.com>", "X-Exchange-Antispam-Report-CFA-Test": "BCL:0; PCL:0;\n\tRULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(6041248)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);\n\tSRVR:CY1PR07MB2554; BCL:0; PCL:0;\n\tRULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);\n\tSRVR:CY1PR07MB2554; ", "X-Forefront-PRVS": "0413C9F1ED", "X-Forefront-Antispam-Report": "SFV:NSPM;\n\tSFS:(10009020)(7370300001)(4630300001)(6009001)(189002)(199003)(54906002)(6916009)(50226002)(189998001)(36756003)(2950100002)(5003940100001)(106356001)(25786009)(86362001)(33646002)(7736002)(8676002)(66066001)(81156014)(305945005)(81166006)(50466002)(48376002)(47776003)(53936002)(478600001)(118296001)(72206003)(107886003)(76176999)(50986999)(2906002)(68736007)(6486002)(105586002)(6116002)(110136004)(6666003)(5660300001)(3846002)(7350300001)(4326008)(101416001)(97736004)(42186005);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB2554;\n\tH:atltest07.rdc.aquantia.com; FPR:; SPF:None;\n\tPTR:InfoNoRecords; MX:1; A:1; LANG:en; ", "Received-SPF": "None (protection.outlook.com: aquantia.com does not designate\n\tpermitted sender hosts)", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-OriginatorOrg": "aquantia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "28 Aug 2017 18:52:52.1156\n\t(UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CY1PR07MB2554", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "From: Pavel Belous <pavel.belous@aquantia.com>\n\nThis patch removes datapath spinlocks which does not perform any\nuseful work.\n\nFixes: 6e70637f9f1e (\"net: ethernet: aquantia: Add ring support code\")\nSigned-off-by: Pavel Belous <Pavel.Belous@aquantia.com>\n---\n drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 42 +++++++----------------\n drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 1 -\n drivers/net/ethernet/aquantia/atlantic/aq_utils.h | 1 -\n drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 11 ++----\n 4 files changed, 14 insertions(+), 41 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c\nindex 9ee1c50..08b7275 100644\n--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c\n+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c\n@@ -597,14 +597,11 @@ static unsigned int aq_nic_map_skb(struct aq_nic_s *self,\n }\n \n int aq_nic_xmit(struct aq_nic_s *self, struct sk_buff *skb)\n-__releases(&ring->lock)\n-__acquires(&ring->lock)\n {\n \tstruct aq_ring_s *ring = NULL;\n \tunsigned int frags = 0U;\n \tunsigned int vec = skb->queue_mapping % self->aq_nic_cfg.vecs;\n \tunsigned int tc = 0U;\n-\tunsigned int trys = AQ_CFG_LOCK_TRYS;\n \tint err = NETDEV_TX_OK;\n \tbool is_nic_in_bad_state;\n \n@@ -628,36 +625,21 @@ __acquires(&ring->lock)\n \t\tgoto err_exit;\n \t}\n \n-\tdo {\n-\t\tif (spin_trylock(&ring->header.lock)) {\n-\t\t\tfrags = aq_nic_map_skb(self, skb, ring);\n-\n-\t\t\tif (likely(frags)) {\n-\t\t\t\terr = self->aq_hw_ops.hw_ring_tx_xmit(\n-\t\t\t\t\t\t\t\tself->aq_hw,\n-\t\t\t\t\t\t\t\tring, frags);\n-\t\t\t\tif (err >= 0) {\n-\t\t\t\t\tif (aq_ring_avail_dx(ring) <\n-\t\t\t\t\t AQ_CFG_SKB_FRAGS_MAX + 1)\n-\t\t\t\t\t\taq_nic_ndev_queue_stop(\n-\t\t\t\t\t\t\t\tself,\n-\t\t\t\t\t\t\t\tring->idx);\n-\n-\t\t\t\t\t++ring->stats.tx.packets;\n-\t\t\t\t\tring->stats.tx.bytes += skb->len;\n-\t\t\t\t}\n-\t\t\t} else {\n-\t\t\t\terr = NETDEV_TX_BUSY;\n-\t\t\t}\n+\tfrags = aq_nic_map_skb(self, skb, ring);\n \n-\t\t\tspin_unlock(&ring->header.lock);\n-\t\t\tbreak;\n-\t\t}\n-\t} while (--trys);\n+\tif (likely(frags)) {\n+\t\terr = self->aq_hw_ops.hw_ring_tx_xmit(self->aq_hw,\n+\t\t\t\t\t\t ring,\n+\t\t\t\t\t\t frags);\n+\t\tif (err >= 0) {\n+\t\t\tif (aq_ring_avail_dx(ring) < AQ_CFG_SKB_FRAGS_MAX + 1)\n+\t\t\t\taq_nic_ndev_queue_stop(self, ring->idx);\n \n-\tif (!trys) {\n+\t\t\t++ring->stats.tx.packets;\n+\t\t\tring->stats.tx.bytes += skb->len;\n+\t\t}\n+\t} else {\n \t\terr = NETDEV_TX_BUSY;\n-\t\tgoto err_exit;\n \t}\n \n err_exit:\ndiff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c\nindex 9a08179..ec5579f 100644\n--- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c\n+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c\n@@ -101,7 +101,6 @@ int aq_ring_init(struct aq_ring_s *self)\n \tself->hw_head = 0;\n \tself->sw_head = 0;\n \tself->sw_tail = 0;\n-\tspin_lock_init(&self->header.lock);\n \treturn 0;\n }\n \ndiff --git a/drivers/net/ethernet/aquantia/atlantic/aq_utils.h b/drivers/net/ethernet/aquantia/atlantic/aq_utils.h\nindex f6012b3..e12bcdf 100644\n--- a/drivers/net/ethernet/aquantia/atlantic/aq_utils.h\n+++ b/drivers/net/ethernet/aquantia/atlantic/aq_utils.h\n@@ -17,7 +17,6 @@\n #define AQ_DIMOF(_ARY_) ARRAY_SIZE(_ARY_)\n \n struct aq_obj_s {\n-\tspinlock_t lock; /* spinlock for nic/rings processing */\n \tatomic_t flags;\n };\n \ndiff --git a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c\nindex ad5b4d4d..fee446a 100644\n--- a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c\n+++ b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c\n@@ -34,8 +34,6 @@ struct aq_vec_s {\n #define AQ_VEC_RX_ID 1\n \n static int aq_vec_poll(struct napi_struct *napi, int budget)\n-__releases(&self->lock)\n-__acquires(&self->lock)\n {\n \tstruct aq_vec_s *self = container_of(napi, struct aq_vec_s, napi);\n \tstruct aq_ring_s *ring = NULL;\n@@ -47,7 +45,7 @@ __acquires(&self->lock)\n \n \tif (!self) {\n \t\terr = -EINVAL;\n-\t} else if (spin_trylock(&self->header.lock)) {\n+\t} else {\n \t\tfor (i = 0U, ring = self->ring[0];\n \t\t\tself->tx_rings > i; ++i, ring = self->ring[i]) {\n \t\t\tif (self->aq_hw_ops->hw_ring_tx_head_update) {\n@@ -105,11 +103,8 @@ __acquires(&self->lock)\n \t\t\tself->aq_hw_ops->hw_irq_enable(self->aq_hw,\n \t\t\t\t\t1U << self->aq_ring_param.vec_idx);\n \t\t}\n-\n-err_exit:\n-\t\tspin_unlock(&self->header.lock);\n \t}\n-\n+err_exit:\n \treturn work_done;\n }\n \n@@ -185,8 +180,6 @@ int aq_vec_init(struct aq_vec_s *self, struct aq_hw_ops *aq_hw_ops,\n \tself->aq_hw_ops = aq_hw_ops;\n \tself->aq_hw = aq_hw;\n \n-\tspin_lock_init(&self->header.lock);\n-\n \tfor (i = 0U, ring = self->ring[0];\n \t\tself->tx_rings > i; ++i, ring = self->ring[i]) {\n \t\terr = aq_ring_init(&ring[AQ_VEC_TX_ID]);\n", "prefixes": [ "net", "v2", "1/6" ] }