Message ID | 20190120065007.21352-9-idosch@mellanox.com |
---|---|
State | Accepted |
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="iBysOJ6X"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43j51Q3WDhz9sCr for <patchwork-incoming-netdev@ozlabs.org>; Sun, 20 Jan 2019 17:51:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729638AbfATGvE (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Sun, 20 Jan 2019 01:51:04 -0500 Received: from mail-eopbgr30066.outbound.protection.outlook.com ([40.107.3.66]:64432 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729128AbfATGu6 (ORCPT <rfc822;netdev@vger.kernel.org>); Sun, 20 Jan 2019 01:50:58 -0500 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=XPlXHQ4oQRMnc/JHu5HSip39tTbKustQGzkPX3voKrQ=; b=iBysOJ6XO8oRXRS6XDvbUnZZpjmPTcI6Mh1LKHDlo5lMBvn94hsw2xVbP/CXpEFgI4o8OCkVMSFc3Y7bhNjlPSqVqiBAEFWvMDbA+SW+baxiTVADMk8UGsGol+/GK/TMUbYkYxeN7XjNA50DppQbUbdy5j/R68bs18kvclA+gDs= Received: from AM6PR05MB6056.eurprd05.prod.outlook.com (20.179.2.148) by AM6PR05MB4408.eurprd05.prod.outlook.com (52.135.162.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Sun, 20 Jan 2019 06:50:48 +0000 Received: from AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::3411:612a:f48b:a5e2]) by AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::3411:612a:f48b:a5e2%5]) with mapi id 15.20.1537.031; Sun, 20 Jan 2019 06:50:48 +0000 From: Ido Schimmel <idosch@mellanox.com> To: "netdev@vger.kernel.org" <netdev@vger.kernel.org> CC: "davem@davemloft.net" <davem@davemloft.net>, Jiri Pirko <jiri@mellanox.com>, Nir Dotan <nird@mellanox.com>, mlxsw <mlxsw@mellanox.com>, Ido Schimmel <idosch@mellanox.com> Subject: [PATCH net-next 08/18] mlxsw: spectrum_router: Change mlxsw_sp_ipip_lb_ul_vr_id() Thread-Topic: [PATCH net-next 08/18] mlxsw: spectrum_router: Change mlxsw_sp_ipip_lb_ul_vr_id() Thread-Index: AQHUsIx5bZ+y24ydx06Ol0Fi3yVN+g== Date: Sun, 20 Jan 2019 06:50:48 +0000 Message-ID: <20190120065007.21352-9-idosch@mellanox.com> References: <20190120065007.21352-1-idosch@mellanox.com> In-Reply-To: <20190120065007.21352-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P192CA0103.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:8d::44) To AM6PR05MB6056.eurprd05.prod.outlook.com (2603:10a6:20b:ab::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR05MB4408; 6:fLZ4TueC/jMniA/EcNmBf5ZPVZnL1ORedO66vMnO8cWcki6/iPxHNs95ErY+21HrnlnHLmsY0lT8LkXbpeSGvuqBujUtRbTHdP2eMe6SQYnicacme9VuY7ANmBpTWuvPlEvoepN8xXtUpJT+nQQ0YeqHJ7Z6NJ2AIaiXNPIRRYTIjK7NLjZqTuMlEPg+ME6YIqC7Ghs9qO4oXFfvpI8+9Y+qoPTbK2peq6aLlC4KU2goN+AKYy8bXl0ZR2FEGwdPtI+hn58Y/MFydgCzZlIYgHBvmRb6brfmGY8P5PU1jKr/UtVx4k9rMQMYriMZZVGR0yTi50vMwEi5tBEsHBL1/8wWIsYjk1xDO6pr8xpuvk7PBb0YeHPHUthGrnw7LiRBnrswGlZMcHO71zt/sk4kYLilXlr3NTE79owDXkLCunMkmJSauipwJU3UidcTl6DiJSjX8/xTHB8YOdm96zXSQA==; 5:ooMasaTEtdT/4Gn0HOvhndxzMg9v14QNw+PRms42hIKbKHT8sfPP3XN8VnH0OK+1mk/8cxfmrdAzNqH1Yw3Fu70BFUITIhmzGPecsB8ctApLustyXlI6xM49LKwhTNUwDJRJO3hqfW/7Rlf7gVrrfl5wztgnJStp6iAwj73MP+wewkeWCy7neTWNeMCxH0/Uq4KI7Vfxc0K9FImSpF4Dbw==; 7:ubpcCKGpqCe5sKMbNZl08RbVi8+qSuRxZiec7XBL7FmnUtvkfu1MLKBpbmjBBPhYQ5Xput/Mx7KOpB9mWpcv4d/r/Qm7G5uVzaUsLA8lkic/FWbfhZLHNaljtX84TGKqzE1dwwE+vYSVadgG5uligg== x-ms-office365-filtering-correlation-id: f22cc9d0-424e-46ca-45a8-08d67ea39c39 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600109)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB4408; x-ms-traffictypediagnostic: AM6PR05MB4408: x-microsoft-antispam-prvs: <AM6PR05MB44083B7ACA666BFE37DB1DFFBF9E0@AM6PR05MB4408.eurprd05.prod.outlook.com> x-forefront-prvs: 0923977CCA x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(39850400004)(376002)(366004)(136003)(346002)(199004)(189003)(8936002)(66066001)(2351001)(106356001)(105586002)(7736002)(81166006)(1730700003)(81156014)(305945005)(8676002)(316002)(54906003)(6116002)(6512007)(3846002)(99286004)(14454004)(478600001)(1076003)(66574012)(486006)(53936002)(4326008)(107886003)(71190400001)(256004)(14444005)(25786009)(71200400001)(68736007)(102836004)(36756003)(186003)(26005)(6916009)(476003)(2616005)(50226002)(11346002)(446003)(6486002)(6436002)(5640700003)(386003)(6506007)(2906002)(52116002)(76176011)(2501003)(97736004)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4408; H:AM6PR05MB6056.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 0hjOELocpJcuMhAqOkupusZ2GESZcaIMax6uVxUiiHdG/HITgedwWSQyps+Gl1K+yCut6PaL7k1Zo1CAhch09YxKj+smb6OahLxsThwV0jWbkzKtdC3pEhn2lJE8Jus7ZPw8obvc9h9Op0plDnjBFbq8LLca2FGdvyDLiAcWKV1VtXfBZ8mkQPKmqmHgOQjdlyKWrOzhsAZlHgl/rPSLKELbYok4/c9YBkld274PJC/oCdwca9Hn6kwDALSrTDaO2UshPsuBYvLPFZtqTReOCn2O7uruwVeyBlMbYFYuxHkaHxz2qv2kzU6AvACXU9NF7mSAbXzecv5/FiVKhAb8IiSxD26ibIVaRrYlyANS+JNjh2GfXcogK9TTHpPvg2+TF1H8OH8Ycpo3BGIsezM/9ocE3d8CwtMEU8Y6DABJjEE= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: f22cc9d0-424e-46ca-45a8-08d67ea39c39 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jan 2019 06:50:48.0115 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4408 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
mlxsw: spectrum_router: Add GRE tunnel support for Spectrum-2
|
expand
|
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index c9dbef5ed6e3..2cfbba810527 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -6251,7 +6251,14 @@ u16 mlxsw_sp_ipip_lb_rif_index(const struct mlxsw_sp_rif_ipip_lb *lb_rif) u16 mlxsw_sp_ipip_lb_ul_vr_id(const struct mlxsw_sp_rif_ipip_lb *lb_rif) { - return lb_rif->ul_vr_id; + u32 ul_tb_id = mlxsw_sp_ipip_dev_ul_tb_id(lb_rif->common.dev); + struct mlxsw_sp_vr *ul_vr; + + ul_vr = mlxsw_sp_vr_get(lb_rif->common.mlxsw_sp, ul_tb_id, NULL); + if (WARN_ON(IS_ERR(ul_vr))) + return 0; + + return ul_vr->id; } int mlxsw_sp_rif_dev_ifindex(const struct mlxsw_sp_rif *rif)