Message ID | 20180625074818.17073-3-idosch@mellanox.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="Qr5sBVWz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41DhCF03Tpz9ryk for <patchwork-incoming-netdev@ozlabs.org>; Mon, 25 Jun 2018 17:49:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752575AbeFYHt1 (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Mon, 25 Jun 2018 03:49:27 -0400 Received: from mail-db5eur01on0056.outbound.protection.outlook.com ([104.47.2.56]:27325 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751460AbeFYHtX (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 25 Jun 2018 03:49:23 -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:X-MS-Exchange-SenderADCheck; bh=NydPM63hmuk560VwZ0DWKnhRStO34Y5IV7f2yqQiC9g=; b=Qr5sBVWzXm55+NjESICElYQgCbW4dBn8mZZ+T4EMXe++/ULasQpOrsW/dg9CQxLsKY49zxy4ly41i/KDeyWmcM8Mt8vlfxOibXR01UQXKz5Fm5yOaFDmSaQSVTuhzXiTN2CgZs53heFOhVkJG5abb7SqAlh9V+Rs9h4DO2QKMqI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; Received: from splinter.mtl.com (193.47.165.251) by DB6PR0501MB2326.eurprd05.prod.outlook.com (2603:10a6:4:4c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.21; Mon, 25 Jun 2018 07:49:19 +0000 From: Ido Schimmel <idosch@mellanox.com> To: netdev@vger.kernel.org Cc: davem@davemloft.net, jiri@mellanox.com, petrm@mellanox.com, mlxsw@mellanox.com, Ido Schimmel <idosch@mellanox.com> Subject: [PATCH net-next 2/6] mlxsw: spectrum_router: Allocate FID according to PVID Date: Mon, 25 Jun 2018 10:48:14 +0300 Message-Id: <20180625074818.17073-3-idosch@mellanox.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180625074818.17073-1-idosch@mellanox.com> References: <20180625074818.17073-1-idosch@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [193.47.165.251] X-ClientProxiedBy: LO2P265CA0008.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:62::20) To DB6PR0501MB2326.eurprd05.prod.outlook.com (2603:10a6:4:4c::25) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7b2e18c3-11f4-4a95-c7d8-08d5da7028f7 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DB6PR0501MB2326; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2326; 3:6zjgdVR3iG51iGsdVBWYMEYKgwFWaNVYMwlUKKSYubLWfxHqd0wh1Yyv1ULhg9OZJPUfKXabADAeDGxr4xeyrCGKQRdj9TKPdy0a9yWHMongNz/AtX3tZbjq5t1/MHae/mBMQGmc8uyUJU4FJ6tuvgvGAAgy/9QET12+iKRNOyZtyzdIH4zIA0+c1A1SX6zumsXpglf2/qjoCNVzzH2/idu4krUtx09DU/UGV8GlAKKULJ16tIve17dmHzv0nUoE; 25:/t3gfuXW3Y/FcBaY5tuZXgxWrxBIc35krXiAR3bhJh7n4zclrau8E4sjNy8yIqQL8r1+3ekAWPUjztqoaomFlUysQl38Kdz6r6bRjHQb4kVNFrDZF9u/yTQWVn11MoMLekWDDyZnQYCX00Bf8xf1jKOKlwcP4dV0bq+5eLzJAo4LC1vEGUxIS56IG+7xVKCNeTMhn5E1li6E8eoV0WaW6rtWqg8cNrO5KlYfLnWFNHCJKyYgQ9IknA/J6k31Wx5+mrQ/I9disP1hT1b0Ozy139ibYiWKtd6PP74RrRKkXK5NP1Y8ZfxTU1Mz01+h+W3z9XHFRiN/ch/KwHca/6UFKA==; 31:5mF9tcUhWbZe5Bbzf32hjpDI+qB5NtwBExSoD0VUPoCrDQvd1lwaLb4in3XRgM40aKK2TFTxfhcH/dnpxSxsykM7ZyyQBJLj640o3xi9KGt6ihk5lmJYRK8K477Uo/0swqFMQi6JypcPEaMtKa57aQe7UoEkQcc4rIXZKWoEjZ4Ias4yvK6Jv0wduzrtx/kuCAAgLeVsUKtw/d2KKoTDd/ZfF5S2GNAM0UesgiqBxYk= X-MS-TrafficTypeDiagnostic: DB6PR0501MB2326: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2326; 20:bw8UtczWE5oxG7WR9EIlOovo+vokyqEYaladMRH06lKICLmL7RUcasqxSvlGiLUVnR8dimusTfn/CKm80LWZEMltNO3bEx9wsI690yNOCy/jC63M1tIU4zUJ6IhxWichwyZLeiopkpaZvGXGPYg7NW1323+UvDYw9mwgYLrzmpo1Utx0jNkbWyGgEL/4QVcAzZC7EgElqqq14hdw9naRoCx7/rHPdml/X/YQfaQ4GbKNBySXd6WJW8lJAYdIwJUhpvZv4SmsSZbZWPexbKUVgnMYu+CTXSM1ys/s2i8uZ1jQDZfOLo8v23p97wrD8rDdnJ2c9pSQMfYlvNMVyV/1Qi2u1u1MYTx3gcvYjBJi0rdDiPYZIU0AHOFmlzIL/kgPKEx44dz3nqH0EArmWiFI+e1SbPfNTbrebdu8r/D7a9tL9Qs2KqDqp6OBu9+RF3/fO2+fu6MkUBn5R3HykcU7ri0SjT/0EImcOgViEnQGKEObYYYzqrczCoObRYFzLjVC; 4:Rpspj+GzPKCnDGcxB0mbEgc0csjFiYKmLoveDcHADEekLo8wXXWkjV0msvP7MXn2qoNH5TOW76EQLb+aoBowosyKooiyJ6mkGXPiPKekAqFy+LDfqj6R/YBHhNdOpKbTx7Tr1rqkbVnZliz2DOoOEqXZ1R6Oz9PsuHaHSWS0y4EqkkW+iecaJmDAXfuDk7oaSxi5N+7jBS4qLALPjybJT572CTs3kUZ8GwX3drc2wDw6fgj1Pi0PcUU1sfTF3j7byitO/hyWGgsyX+NQ3Mh02w== X-Microsoft-Antispam-PRVS: <DB6PR0501MB23269986E508324747B20D2DBF4A0@DB6PR0501MB2326.eurprd05.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(3231254)(944501410)(52105095)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DB6PR0501MB2326; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0501MB2326; X-Forefront-PRVS: 0714841678 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(346002)(396003)(39860400002)(366004)(376002)(189003)(199004)(6506007)(86362001)(476003)(50466002)(81156014)(956004)(8676002)(2351001)(7736002)(2616005)(52116002)(2906002)(107886003)(2361001)(478600001)(11346002)(446003)(53416004)(26005)(51416003)(76176011)(386003)(81166006)(59450400001)(16526019)(105586002)(186003)(48376002)(47776003)(106356001)(8936002)(6486002)(66066001)(53936002)(16586007)(316002)(68736007)(6666003)(25786009)(3846002)(50226002)(6116002)(97736004)(6916009)(305945005)(5660300001)(36756003)(486006)(4326008)(1076002)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0501MB2326; H:splinter.mtl.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2326; 23:1KashEYfAWwyz1yOaTxmLkg6p1eYk9qJnxNC62G8oeIGpNljuJ7dh1FJTXbenDG4USKRm57laYm4zGAXWG3Etj/7CNqj7K+IDJ3LxAZb/YutTCGCFwhRcPKcAQUwpnDo372kO+21tRZfgazsAB9l770b8JLvyIqxZZR8nQbrj+LVq1mzkN+R/GpNVWtSAFhj+XMfcOw1w4bO/VoV36UH7PRCu6j298jk6401QNHxtR6+0mMAeyPPJh1w5So/qwm2P0LRc/yp0mElONNeoWv9O2C3JlD1mL1GVCJ/2TcI9YyLP//jjzffddc5GAd3ux9ISlwkUZ1tu29gkHlrcu8pD7SFlGk/DlMIckEWjGBshXpiskWdlZCHNkyBgiMkg7HHnXQgV2egZ8G3msQOAzGG/8Y7MI9r0SImU/yTwQj0NjBkJE8juXTbLvRltZf1oVTGPoCO3uCqcx1qjWG2Waw9aAd4TOWm9SjEi4HNFNRwzfd7vgtvlYbiK6dWc82WSZ7mBlz4Pk4/PGi44gPICXf1p7K4YE4ofCPVftM3PzK5SF8lq+R1m2VunjU8A2BfDjEbdZ5LTCNxI8H9x+PXC8iTGdV5qTH6Gkt29bcRNTUdc9Eb6gnuhig0xcYa/u3jyTDl/m9SqEA0XhuXv8n05vVS+nP7tD9yhO5FbB6LQBQk92Ohx2RbTbTiok6HYtDEfoycLrXz85mjts9L6CxRzFoZ45QRXiHPDyKsb4Oq7rrq39falWsRYVYxDAlfpbAXqZithcDi9kW4DxHRbkcyYaxdBXqEbXUuEBfLHgRJwh5HyM77fMs99mMxEAdt1+X/oov4fpj/GH2Zg6ai7I6t4/SUxXZYexnbNthxifCVkMKmG71cbiE26FjtOQ+CdwcjUeFhYZxPWwl3XqLrZfseOiNb7FurE1A/2yxMhf+s0++5J/mvxtzExBlpbeTrab6Pu4GPKwuhcuUMcitsI6H+W/YJV+/XQNMYjGI7q0fPVPPBO0Ojk6p/7SujnrtYMkeTvDhrDE9upK+edGZBbFP18/dKbXmPfJCyUV8ww929yRNPsFdyC7soLaDIyTxZblUA8JXh3VEUnfXb6wbJoyij+04CYBwzQZPAoLnNCzvLKUjDGDINwZpmUoM8uem7pjsVDFv4wpXbioO5n0oE67neXyHi53apl3ucZoSk3NPsdb17otoU1J3qsfbq3B4HLZakr4823amNrgmzLUixTASG1tTA7X4pqVGlalZpheeu7AmC17nYrA3zK+E8H2AN4It/oMuQ1AcXAwt3rScegWoBUDTgp1dPbU4ErrnRTHAUQWiqpbg= X-Microsoft-Antispam-Message-Info: C8tRZrZul+YG8esl+seaJ9QhoH8CJtPxZdElcEiE6OXf+/whh+/yWvlLxjl0yJvJAyO0bD6NdhPDWUwgEpBDbxwis5mZlAEv6BO+OLCEOA2QrRAFEjAb60IG6rLv2JOaD0ooSsws5EPzmRZh/y+fCwOrKrqcj3bcPazR8UX+HtZkwMH3/E8RO8EUSOOPLsLqtf73wZ6S8LfjnF26RCpRI8Pi1pWEAxMGHTvYpvt6mxTOHAkRKReUhMR33xFzMjBOWjPYof97MSbTwbejmPl9mHOGMtlnaPdn663DGlO1cZIr6TMihHzmlS7jGmmI1QE9fgjEtIJEl4FESkBBEE/xFaraQFBIRJcNVLvnKhoLgRI= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2326; 6:/qwGNy75rbiryzkMcL8Jh0zBD9KuwkyvU1+OHP6ZIilvyLoyGEIPk19RcjzORTzyS34+n39Yi91aUVsn74VP86SbzwNuAZOeVhaRanHb6OoNUnAo+OyC0g80kNw/hWsm+w0hcY8ycHKb/kUSl1k9HRAX6e6Gl4U0MpLwgcRUUB26WWa/Qr017Zh71LoGSgr0Jh148JVRL6BAjmgqDkY29LwXRfFM9fGXVfp74tAG/42o7RAX/aDVHXkpkCJ+uNlbjQg1MLVYnXfSTN6V+TwrlEYke1S5wd6fg7S7wqUejarSwkoOTCK0pCkEaaNNKKXF5RwKDFTlcoIQCs4MqewR7IHlH8BiKtoURGIjTkOhNepEl+sjJkW9RQn+GkDqxPHZyJy/PMQK/lDdIRNt/EwTRSNzURgFKc1faelg76p3ItjbJM/1srSn+41sN7rO6aOqZ3TLT+V0/YaHbkAH9r49HQ==; 5:sX5WXPWpTn7CDRVG+5fyCFO7U9JBBrmcrm3urrFwOz8w/BaV2WzKI9vPUEQQY82jhktORtxlj382hrMBv72P1t0TUBU+uTtb1+kPr2VC3mbMRiffr4FRtDtIAGlDEtwGbKAfS7LzhmlEpZQQqDzztGxWqKaYgaekgZF5nC7cIk4=; 24:4L2BljGFLBSa9ZsWmdmeP6/pbDGlrU7V7HQ2YxJ0VLTSAt6CtCgkWEPTivQks0nykBN6KKIazpnqHvvSmHHJ8A90Yp0g02OQxq+MJ2M8YMI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2326; 7:JwaL147Bpf3urxzEA9/FlkqQtNkGrXyyd3Sko+TYi3uJfs6bCZlPQXqncEdLfKyE5RqfTCeChLEPmTqIMrjekMPsiIem/7qQDwPaFAYmDr1yjyE6e2iP+Ox/4NJ06GiSt4PhVef2w36Hu6kBMW6zbaxNC6QVCEq8A2SB/zaOeRVY4y4lZFpDFTwFYQ2RA0Jcis9m4xwLanUQQVRNRI+BvfMrklAC58i60PNjl35Ec7Qk9KjYigaKFxPwIEyremg3 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2018 07:49:19.2875 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7b2e18c3-11f4-4a95-c7d8-08d5da7028f7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0501MB2326 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
mlxsw: Support bridge router interfaces with non-default VLAN
|
expand
|
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index 05c52e486330..c7243d3f91df 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -6870,7 +6870,20 @@ static struct mlxsw_sp_fid * mlxsw_sp_rif_vlan_fid_get(struct mlxsw_sp_rif *rif, struct netlink_ext_ack *extack) { - u16 vid = is_vlan_dev(rif->dev) ? vlan_dev_vlan_id(rif->dev) : 1; + u16 vid; + int err; + + if (is_vlan_dev(rif->dev)) { + vid = vlan_dev_vlan_id(rif->dev); + } else { + err = br_vlan_get_pvid(rif->dev, &vid); + if (!vid) + err = -EINVAL; + if (err) { + NL_SET_ERR_MSG_MOD(extack, "Couldn't determine bridge PVID"); + return ERR_PTR(err); + } + } return mlxsw_sp_fid_8021q_get(rif->mlxsw_sp, vid); }