{"id":833721,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833721/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171103090344.19444-8-jiri@resnulli.us/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","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":"<20171103090344.19444-8-jiri@resnulli.us>","list_archive_url":null,"date":"2017-11-03T09:03:35","name":"[net-next,07/16] mlxsw: spectrum_router: Extract mlxsw_sp_ipip_entry_ol_up_event()","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"2652ea426e910e3c0e82b947e7632aa5d1960524","submitter":{"id":15321,"url":"http://patchwork.ozlabs.org/api/1.2/people/15321/?format=json","name":"Jiri Pirko","email":"jiri@resnulli.us"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20171103090344.19444-8-jiri@resnulli.us/mbox/","series":[{"id":11677,"url":"http://patchwork.ozlabs.org/api/1.2/series/11677/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=11677","date":"2017-11-03T09:03:28","name":"mlxsw: Handle changes in GRE configuration","version":1,"mbox":"http://patchwork.ozlabs.org/series/11677/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/833721/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833721/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=resnulli-us.20150623.gappssmtp.com\n\theader.i=@resnulli-us.20150623.gappssmtp.com\n\theader.b=\"P0QLO4Zd\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3ySwxL2dJfz9sNV\n\tfor ;\n\tFri, 3 Nov 2017 20:04:06 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932716AbdKCJD6 (ORCPT );\n\tFri, 3 Nov 2017 05:03:58 -0400","from mail-wm0-f68.google.com ([74.125.82.68]:44297 \"EHLO\n\tmail-wm0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932449AbdKCJDw (ORCPT\n\t); Fri, 3 Nov 2017 05:03:52 -0400","by mail-wm0-f68.google.com with SMTP id n74so2134595wmi.1\n\tfor ; Fri, 03 Nov 2017 02:03:51 -0700 (PDT)","from localhost (ip-94-113-127-32.net.upcbroadband.cz.\n\t[94.113.127.32]) by smtp.gmail.com with ESMTPSA id\n\tc37sm11896358wra.73.2017.11.03.02.03.50\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tFri, 03 Nov 2017 02:03:50 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=resnulli-us.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=VxOUVwSh8R7G0Wd9tT6KCW8LqPKzxlxINE2E2xJRdEQ=;\n\tb=P0QLO4Zd3lkDYOEG3b5CSJIAYQjHzufdMFPNZWM4bXmK+NWcL1ndqYhdSoEjmdbYRI\n\tS64IV6MvRHUKDNPqHg68VIjHEqUG2azHJHjDX10ha7uzQB+AAUJ1/PX9/DW+Jh0FWIW9\n\txO5Y5SC0O03Ulsl4n/H/MRbu7RhOwrqUAfd446TODZCEiNozQXWeGG1Ldbjn92aDIzLn\n\t4oTDH/Yzx5m3zgqV1nFCiIykMlj27VDLntACMW/UoKlLzPFYaHbrkbI02H3gHnaA35ZC\n\t6rqcVCvyWjqBdQnxbsY0t+KJTYCsfMOYi3jejZxJmUuysMSn1nCNG0woa4EZqr246W/Y\n\tS3NQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=VxOUVwSh8R7G0Wd9tT6KCW8LqPKzxlxINE2E2xJRdEQ=;\n\tb=tmt0+COOrk2ilRSVcW/rSq0+CAJwHVymtwIGle9aSjoJCnn+qYd6C+u7xSDLo5TJbK\n\t+0m+o3vt+YeQkirR5jOqWXdi3L7uvOh0O8m3xjLzw7NL/3Ugmopsdn9/z1DuI7JBf5l8\n\t38jAQQrtGeddYVkRipdNh6UXLzaFqLaWz8SUruhIlgBSsPtmqnbS+liKQZKxzVI5kIXE\n\tWUHY6IsMvrTX+q7jwX/5oQN1YbthS0WDOtdHpnDr0wGPdLuvskScuM3aFUhskXQWBe5z\n\tQqA3jlpyRmGLbn09QJQAQ0Xva+lkb0Hj6VeQhc1AeUx8PALv6inwwacYBnCtRSZYQW02\n\twkXg==","X-Gm-Message-State":"AMCzsaUiXUgkulfSc5885/QnDMyk2BggFMkAwcQX8Iz3VnfU6zBUXav6\n\t/BQ4655V/99bWl2CJP/r2Up13GVt","X-Google-Smtp-Source":"ABhQp+TnwCYhx78TUZtI6rRKAze0QPNDljxxEnEodiOdxAleUSWtoagBktSmIVk/Z0O5A1iO4S5hsg==","X-Received":"by 10.28.209.200 with SMTP id i191mr3500965wmg.156.1509699830773;\n\tFri, 03 Nov 2017 02:03:50 -0700 (PDT)","From":"Jiri Pirko ","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, petrm@mellanox.com, idosch@mellanox.com,\n\tmlxsw@mellanox.com","Subject":"[patch net-next 07/16] mlxsw: spectrum_router: Extract\n\tmlxsw_sp_ipip_entry_ol_up_event()","Date":"Fri, 3 Nov 2017 10:03:35 +0100","Message-Id":"<20171103090344.19444-8-jiri@resnulli.us>","X-Mailer":"git-send-email 2.9.5","In-Reply-To":"<20171103090344.19444-1-jiri@resnulli.us>","References":"<20171103090344.19444-1-jiri@resnulli.us>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Petr Machata \n\nThe piece of logic to promote decap route, if any, is useful for generic\ntunnel updates, not just for handling of NETDEV_UP events on tunnel\ninterfaces. Extract it to a separate function.\n\nSigned-off-by: Petr Machata \nReviewed-by: Ido Schimmel \nSigned-off-by: Jiri Pirko \n---\n .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 23 +++++++++++++---------\n 1 file changed, 14 insertions(+), 9 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\nindex 2b05f9f..ce0d462 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n@@ -1314,21 +1314,26 @@ static void mlxsw_sp_netdevice_ipip_ol_unreg_event(struct mlxsw_sp *mlxsw_sp,\n \t\tmlxsw_sp_ipip_entry_destroy(mlxsw_sp, ipip_entry);\n }\n \n+static void\n+mlxsw_sp_ipip_entry_ol_up_event(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\tstruct mlxsw_sp_ipip_entry *ipip_entry)\n+{\n+\tstruct mlxsw_sp_fib_entry *decap_fib_entry;\n+\n+\tdecap_fib_entry = mlxsw_sp_ipip_entry_find_decap(mlxsw_sp, ipip_entry);\n+\tif (decap_fib_entry)\n+\t\tmlxsw_sp_ipip_entry_promote_decap(mlxsw_sp, ipip_entry,\n+\t\t\t\t\t\t decap_fib_entry);\n+}\n+\n static void mlxsw_sp_netdevice_ipip_ol_up_event(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t\t\tstruct net_device *ol_dev)\n {\n-\tstruct mlxsw_sp_fib_entry *decap_fib_entry;\n \tstruct mlxsw_sp_ipip_entry *ipip_entry;\n \n \tipip_entry = mlxsw_sp_ipip_entry_find_by_ol_dev(mlxsw_sp, ol_dev);\n-\tif (ipip_entry) {\n-\t\tdecap_fib_entry = mlxsw_sp_ipip_entry_find_decap(mlxsw_sp,\n-\t\t\t\t\t\t\t\t ipip_entry);\n-\t\tif (decap_fib_entry)\n-\t\t\tmlxsw_sp_ipip_entry_promote_decap(mlxsw_sp, ipip_entry,\n-\t\t\t\t\t\t\t decap_fib_entry);\n-\t}\n-\n+\tif (ipip_entry)\n+\t\tmlxsw_sp_ipip_entry_ol_up_event(mlxsw_sp, ipip_entry);\n }\n \n static void\n","prefixes":["net-next","07/16"]}