Message ID | 1470321382-10426-4-git-send-email-idosch@mellanox.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3s50843pVgz9sBf for <patchwork-incoming@ozlabs.org>; Fri, 5 Aug 2016 05:17:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b=VvEOUCZI; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965595AbcHDTRp (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Thu, 4 Aug 2016 15:17:45 -0400 Received: from mail-db5eur01on0089.outbound.protection.outlook.com ([104.47.2.89]:20160 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965309AbcHDTRk (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 4 Aug 2016 15:17:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=9c1EyxCMPwY6iRgMlJgNw1jktPJaYYflTgTvqqLiY/A=; b=VvEOUCZIziSeDBy/kCtfm+x/3IcWcMTI9NETi2zOeaD/jZD0BWmaRQHgkhvrR+xVZebaoFo6CgxMzCzc6H0811N2FU4mLUvv7P3WNMndJ9GC77X9FySDiIHYBngWj66xNwiwvsyzD5KmZq4RZ4JAcj811RnlF+gBQwvWXvQ7NRY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; Received: from colbert.mtl.com (193.47.165.251) by HE1PR05MB1724.eurprd05.prod.outlook.com (10.169.120.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Thu, 4 Aug 2016 14:39:40 +0000 From: Ido Schimmel <idosch@mellanox.com> To: <davem@davemloft.net> CC: <netdev@vger.kernel.org>, <jiri@mellanox.com>, <eladr@mellanox.com>, <yotamg@mellanox.com>, <nogahf@mellanox.com>, <ogerlitz@mellanox.com>, "Ido Schimmel" <idosch@mellanox.com> Subject: [PATCH net 3/3] mlxsw: spectrum: Add missing DCB rollback in error path Date: Thu, 4 Aug 2016 17:36:22 +0300 Message-ID: <1470321382-10426-4-git-send-email-idosch@mellanox.com> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1470321382-10426-1-git-send-email-idosch@mellanox.com> References: <1470321382-10426-1-git-send-email-idosch@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [193.47.165.251] X-ClientProxiedBy: AM4PR0501CA0006.eurprd05.prod.outlook.com (10.167.83.144) To HE1PR05MB1724.eurprd05.prod.outlook.com (10.169.120.18) X-MS-Office365-Filtering-Correlation-Id: 53b99845-f078-48ea-63e6-08d3bc752b7f X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1724; 2:nnlhdxtrVUVvu+djm6iV6/nwcl0aQOzGtngfHtH+oJ+OXbnJ9K/S6CdzbQydZoREdUkBcraEjdeYDZkd78W/rnZF2soIvca9dWrSr+dYd9C0oEbukcHiMa4DYbOSmOMEjt5bKID6KLdM+vUpUVtdpHYuyYJoV2ZzDFMmwhNmhAm/Af8CnTjp1TjUK4LA0bhX; 3:oIOqAzslwZDxA3/++ux5PyvAsPR94w4qBiRsYzFgxGcRwFFlRaJenWFkzm/Z4eR4983sNcqPT6wbXoAi+fWObvYjmIH40bcz7+yFqIYw8l5Bk8226P5jWHLtjKwf9QgI X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR05MB1724; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1724; 25://zOvHDdb3gJ+6slp7z48yiy08/adG/ofZl32fxGHPzoWJDNvdcfWvUh8H7u3esinRtdXjyU+KdjsunoJSj3GqWIAW0IVCzyEXMSOoAqwY1WBbVV+5bRt2B8OOYmutq5UkPctXzyIedk2Yr4i1Ym++L8jTItkbLVOney6+ocTmG/eVU1yZk5MIL0QbLKL8Z37DZjs1e/AXaBE4+vT6X+cIUbSF45/rKRhOZToOTF2ic8qjujegevbPR7+SOQWgqs1T2y/I7qMoq2yZE9yh9Pxn+lLvb+JvU0HbvKP8exwV+152ek5f9LOsHHkiHXjX5H5YQfDOJSRGffCLN14T+KXGwR4gSIO4HpAd6aivyfN+7uqusQXynl07iV8qhEZU4qA2xJcxUkeY5mVAAf1oxl08CXWNccQ6JQxy7QNrjQ0DR4uGDne/GXJjb0Hg44gPiheZNv974/DDZWJDVIp2PY3viDpPTy1JOY3vVsDSVR/5CXodPJiOLbuy+G2vZ7ZBlKxSVulOncSBu2JOE9qCTeaj93kooihz/HKcZhWRplhMoCAazdXTk9X4vv5hCdpJOXeSE7Z9O5Uku8B3lL3LVuEhZp9+SJ3zblTmO28d0OPGe9ph5Jwi+hqSOkYSgalWI2TOgex/8blbJvORFfyga2Co7CSUVRbdEiBkZVAvNftEznkgYIBWkKBcsChG906OPefklTIvfLu9BV8HTfKYRClEU5vKcwIi2UBqB0cLLQBSo= X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1724; 31:0LnoEnZLnBD6sJKowB7qbduHsqqiXyC+A/EgiIEasPjLiupCoKwEMpsemIqJNCcmkl+le2MundxIQ8+rDWMKqb4qSlLZDqbzmJ+KR35P57SiBvrkBO3N1LokDKjMvlAENEoj2b8jKTkN/DUMS/N2ZfMPMQeJA/dn6mEpu+Y1hShLCPp6x8UyU/5HBsVWRdIj2bd4Yru53SKNpaaMoV7rAe3xVnejQUVy07Xxtk6jU8c=; 20:jdp3a7c3tLjpIBTQt07rffgBrTlabWvE6ECy2yyXVun4E2TFipna7bS7y343I42wbX6xtUwmTZL/WFIsKrYKWigvMy5xVXAR8rMW5uQcyKFhBrICDRAXfRsQEpI1BXzqAGiEs+u4L9IiBGVoDtj0oPI1wUnlDOpeY9iNhrwHS9M0j3Ak4laMqH+FsbnDNlpGpheW9FC/UVgAyBA0unc+B4VgSF+6suAxV1H1Jdt0zZJfZZGoj6qoOlIw60VUiysE2YZ4+7kHtNy0/FPL5GhFFUl4hnBVJSIsEW9QO1+iS8tKgJpdBrd4TI4O0XhpPIjchxUhot4UzAbqi8w5zsov92RoEdDJZXjH2UdBYbrOrYHA6bEhFKHMoGfSSoG9i0IOP+Dr4mHOEfdJMg3XowOf+sMKrg5C/tuoGPnBD+Is0o1vyh9duDz79zcyXio8dxu/fNPSUdCYHyfIDsHsgE9EZScQRCuw0kEJHKyk03b7n9vSd1+yBkHhywsYfUuO2edH X-Microsoft-Antispam-PRVS: <HE1PR05MB1724E914FE1B63B7DE10F760BF070@HE1PR05MB1724.eurprd05.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:HE1PR05MB1724; BCL:0; PCL:0; RULEID:; SRVR:HE1PR05MB1724; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1724; 4:TwMFnlJ2pZdBnAyBL3+ZItvG0GmSlFfK0zYTHhsTKRQnlFUxBSDvimrpupj71/QDmbXZIvWkdIQPKWlo1a6OfM0Ifm7E7b3GmRQ9Hy9gGcSeqIqT7HMrFjhia2ZLm1rwQK2+0wQN8YYi0o5I4Z6uPNqaYWzMvukCC14VHSQuWEzfMI6V9gSFXSbFYL6L+cNdZNVaCAUK07scNN4lUABJ9QG05bV/v+DRekZWuvFx1w3XuamBEkxl9e5PvryNS+4wQGy/s99Dps/ay+jiG8x6X617cu+ogEwUMpd+yovC4O5s/sI2HRcFnSvji7xEfoqhcYx0vRZyZcvY/2t7H3bc41YcpbqMrXwdGRrT6vi3xMJraCANvPvwwVb+4EtjCvqC X-Forefront-PRVS: 00246AB517 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(199003)(189002)(50466002)(4001430100002)(68736007)(5003940100001)(50226002)(19580395003)(19580405001)(229853001)(2950100001)(86362001)(6116002)(7736002)(105586002)(3846002)(48376002)(77096005)(101416001)(586003)(81166006)(47776003)(97736004)(2906002)(2351001)(81156014)(50986999)(76176999)(36756003)(42186005)(7846002)(189998001)(8676002)(53416004)(107886002)(33646002)(110136002)(4326007)(66066001)(106356001)(92566002)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR05MB1724; H:colbert.mtl.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR05MB1724; 23:OpOJC8cfKPxy/KoJeOYUJw7V71akfuFLaysAEEJbq?= =?us-ascii?Q?vwrPFd2RHzJ8Y8VgBEd4D9iS1w3a9wKHpbmxBn+YuQM9dMw/os10zUF+2H/7?= =?us-ascii?Q?sOXE7lvbO2Ni8BW0c8ppFNDWikQwS7DN6ZDFAb3ZEmEkbGPLHq+1qn872M/j?= =?us-ascii?Q?zA3Vxr1dy9amWHQSY23cULzc2LlmOK5l1uCNYvine4CKfqaqTDxZHzB+s70Y?= =?us-ascii?Q?RYXycxMyLWiOOJfGoVLWHAUy0xOW5i92YSlSN2yYjqxLjIThrLiQkrnv/DLi?= =?us-ascii?Q?E/ZIzwbQuHEcSgv+vRGSU7TC23CGQu/VltjT/Fn+RE3+ZKaXn4ZO79uXO0Ft?= =?us-ascii?Q?edfZmDY/SHutWh20X5u4JcmKTRSw4Driyy5HemSsW+XMh09m5S1/VBkcBH2t?= =?us-ascii?Q?cIvPskpHuFEi/Ps2QpjT1Q/adCkjx1ByeHn3J2DmKGc8ZWyghPSLuggxTbex?= =?us-ascii?Q?s6LyOxY7GiZ9V02qCv/pjcPSKC8wyIbg8nPyhaUjxPvQpZOW8XWtnL5+WUDS?= =?us-ascii?Q?hyjo9g3rWjJpaWuECdIgCk9o74jCy+dlzz7XTLrAqRnmtu4BII1IJSuXY80p?= =?us-ascii?Q?wOmBI9/4eVvd2q5od5Jt4uV0lFuh9hR6h8T6iHSO0qbptcUL9ZtEM+O0Q9jA?= =?us-ascii?Q?S2NlVCcGO4DCLSZhvOmBsioNV0F0ZrNBySnIDy9/gIapzVjm3Cf2xunJx4m8?= =?us-ascii?Q?N5s/5OMx0ddJHKplGpuc6nhi6eR99woV+bRBzQTIlXnE8TI1ik6Dbfs13TV/?= =?us-ascii?Q?xqULBxgxiG4CysaPnI3fbsE5IaCblCajJBLU90jdsQv328WFBwhJLBetO14S?= =?us-ascii?Q?QAmMIhATgBZvdmGpPSt34XYjiIlkbusBVs5yuTcy3ABB3JTxEzityfhEgrej?= =?us-ascii?Q?Mx6Be7VcUid/64MrCKEa9AvqQvbw8L5ZYuCeW48wAXohuPPyoHS9mw8oiEmH?= =?us-ascii?Q?TzdjG3GT/uqsrHFqQrKz3WJiuqdVYz6LWeqI1sgTAYz/KpTXegYFoX1Qtaju?= =?us-ascii?Q?Xv8tPCrrMN7zsyQ8MstdJ6ceOf8mnGV5aDE+mFS+YmP5drneMgQlYImn1lkR?= =?us-ascii?Q?O9yz4cZXVsbFsMdzoHTfPcRRi2ChqJR/nYa24UbB57cbkNDXhxZ5TKxBKP0m?= =?us-ascii?Q?JfG2ljmP0/vftf+oUKvy6m6xKJrb4NR?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1724; 6:fr7O55XaIt+SuPLha0VD5TZ7jHMV292oGxt4sXKQSmrXhGGldsZfVbRtoeApUs3k++O4O10xsCZrDXpJcwrZfUEvY/tJ40A/e4UtKdossoded9gHTLsqLM51KJPSRz0vO//cQ8DBXBlGmZTQEA53nR/4UeIhhAhS9SulAz+lf587vlcQBR9j+klmAFVA/RCxOT7b22g3r5UltJ/2EHcjBWpTOaLcT5/4oED87N75SNE10bqCCU5+k7MFD1nnAwTessQymQHrjwEjYMzSJCYuyOzlRc9ca+T9LXxbgkT73fsoYS1jZIDrz/shNdcGrqbMxcYvcX3Apy4XZ+WdMcwtrg==; 5:Y7czwZnM+JVSm06QafImSeb0NHxmAzDcAOJ7HcJ3P8GquX1ulsTt9VsacLw0PPgLR5pUF/d9+lCWJmKrMOJzK6zXYakm/0iU54NXH8rNPq4prHFfCLWJMI61Sf1COHjCZZNq9dce97pCDQXRUInosA==; 24:tNyp3SnlJ+Y3bNFenCcnWcRInhHEmJoCgDm9hQK8ZY/V30OPM/kfumsVK4VWMx2MM+kYpTaRL7baxT4rZrwD73rlvP2ieWDnh6DdW11OK4E=; 7:/5Ig2QJkQIRTbyWqcZ85j6oqVmJ+dxDnvFqgO9Hr+UFZO3eJA23dx39xAsAxJScYmtCvI0xsp2wnBuVTlZkOoJl7LGwBDzmSAYC14dTcKQrrlJVNXJ7HpsEQG6+yzfPbf1NHLE2JMhCTTnEmrCYeaqGjAvWaOvoveLAJnkKb2kx5kG10UWgotILMyfkO2Rog0B/16zWE4Cn+DIfccLkV72+oC1s/9C8bmtNZCvp/pbNLmoQm2Kv11xjMAmTjKCN8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2016 14:39:40.6508 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB1724 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Thu, Aug 04, 2016 at 04:36:22PM CEST, idosch@mellanox.com wrote: >We correctly execute mlxsw_sp_port_dcb_fini() when port is removed, but >I missed its rollback in the error path of port creation, so add it. > >Fixes: f00817df2b42 ("mlxsw: spectrum: Introduce support for Data Center Bridging (DCB)") >Signed-off-by: Ido Schimmel <idosch@mellanox.com> Reviewed-by: Jiri Pirko <jiri@mellanox.com>
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index c3e6150..e1b8f62 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -2220,6 +2220,7 @@ err_port_vlan_init: err_core_port_init: unregister_netdev(dev); err_register_netdev: + mlxsw_sp_port_dcb_fini(mlxsw_sp_port); err_port_dcb_init: err_port_ets_init: err_port_buffers_init:
We correctly execute mlxsw_sp_port_dcb_fini() when port is removed, but I missed its rollback in the error path of port creation, so add it. Fixes: f00817df2b42 ("mlxsw: spectrum: Introduce support for Data Center Bridging (DCB)") Signed-off-by: Ido Schimmel <idosch@mellanox.com> --- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 1 + 1 file changed, 1 insertion(+)