{"id":816257,"url":"http://patchwork.ozlabs.org/api/patches/816257/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170920141516.1402-2-jiri@resnulli.us/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/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":"<20170920141516.1402-2-jiri@resnulli.us>","list_archive_url":null,"date":"2017-09-20T14:15:01","name":"[net-next,01/16] mlxsw: spectrum_switchdev: Change mc_router to mrouter","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"e7254ded755a7ff49b5f52af60575c0055a6ad75","submitter":{"id":15321,"url":"http://patchwork.ozlabs.org/api/people/15321/?format=json","name":"Jiri Pirko","email":"jiri@resnulli.us"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170920141516.1402-2-jiri@resnulli.us/mbox/","series":[{"id":4129,"url":"http://patchwork.ozlabs.org/api/series/4129/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4129","date":"2017-09-20T14:15:00","name":"mlxsw: Multicast flood update","version":1,"mbox":"http://patchwork.ozlabs.org/series/4129/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816257/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816257/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=\"lO8/YeG6\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xy1xk2js8z9sNr\n\tfor ;\n\tThu, 21 Sep 2017 00:16:10 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751732AbdITOP0 (ORCPT );\n\tWed, 20 Sep 2017 10:15:26 -0400","from mail-wm0-f66.google.com ([74.125.82.66]:33550 \"EHLO\n\tmail-wm0-f66.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751408AbdITOPT (ORCPT\n\t); Wed, 20 Sep 2017 10:15:19 -0400","by mail-wm0-f66.google.com with SMTP id m127so2592370wmm.0\n\tfor ; Wed, 20 Sep 2017 07:15:18 -0700 (PDT)","from localhost (ip-89-177-125-82.net.upcbroadband.cz.\n\t[89.177.125.82]) by smtp.gmail.com with ESMTPSA id\n\tx11sm1874130wrb.26.2017.09.20.07.15.17\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tWed, 20 Sep 2017 07:15:17 -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=a3J9aQMSFxL8UMy81IMFPjZW0+p70hbhIm+B90ANoVc=;\n\tb=lO8/YeG6om/+SL3tYDiYdM1BDYt8HivdcYHHTjHVaB2vNMluLCgWy/kQMMSYX9TXmA\n\tq4czzUkUtqWrx9Q+GklYPLzsAIVgBGomoG3jbyIQtCLs3/PsrQE/yjIC6COB42PLPIiL\n\tFKw3HiKr4y/Jn7TFJLCFqCo/F/j9RH0mDn1Va38iwJXoQo0Xk7O4SmDGNP6bws7uzZnT\n\t2lmQhfp0wlKWusVW7xKO3G/fpcPXvvGZBc6dhKm5Z9M8fn+Kz5WVbs7Xuy3hCQw3QDwa\n\tkneWnVgUu2uTsZIVgCsuWrynR1frQqNeH9pZ+dSos1+4rqdyhNysu3Gjvm8nltnQiyFm\n\tGPcg==","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=a3J9aQMSFxL8UMy81IMFPjZW0+p70hbhIm+B90ANoVc=;\n\tb=SKCqIP/NEKLe4onkxYmX9hrCLunVUTFuYHsPkNEnEd/Szc3G6jDv4zHGGQxMFWxrhN\n\t537UUL73IvWveOsaiOaqRjrQE9U3GfMdzCYm7UpUY/5JM9jtfEsTQ3o4q+IBD9JcLTd+\n\tEaoHUP4NjfWInUTsPuLtlpqGp6hB4SEqiOTTLFa1euIDxKh8htkbrlglZMH/uMbU2u5b\n\t6IWfyNIB1KdUmazKgyZfAI5xIsk1dzdgg3Gciv3ZDmebZ2thLgtc+ZXIiP7C1o4GsloQ\n\tI4PzPlhKTtbXrNztPlY86arlPr3JGcb7xpULTJli+BszAPV37LO27cQK6SeA5sfccmEi\n\tjlhA==","X-Gm-Message-State":"AHPjjUg2ZNwVuri65eFpntWlk00dcxlhyKB73rmmeuKGByUF+UkwdL2E\n\ttgDj1aLKun1EzfG2tr95Dt0U7Mgg","X-Google-Smtp-Source":"AOwi7QCGRILtQtGTzzAwBkvZk/pMnFUt2HshehGrFusPkJsLqSIJ5fH6o6BkmsqgNzkXCTYN63X9iQ==","X-Received":"by 10.28.7.83 with SMTP id 80mr4190463wmh.158.1505916918028;\n\tWed, 20 Sep 2017 07:15:18 -0700 (PDT)","From":"Jiri Pirko ","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, nogahf@mellanox.com, idosch@mellanox.com,\n\tmlxsw@mellanox.com","Subject":"[patch net-next 01/16] mlxsw: spectrum_switchdev: Change mc_router\n\tto mrouter","Date":"Wed, 20 Sep 2017 16:15:01 +0200","Message-Id":"<20170920141516.1402-2-jiri@resnulli.us>","X-Mailer":"git-send-email 2.9.5","In-Reply-To":"<20170920141516.1402-1-jiri@resnulli.us>","References":"<20170920141516.1402-1-jiri@resnulli.us>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Nogah Frankel \n\nChange the naming of mc_router to mrouter to keep consistency.\n\nSigned-off-by: Nogah Frankel \nSigned-off-by: Jiri Pirko \n---\n .../net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 18 +++++++++---------\n 1 file changed, 9 insertions(+), 9 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\nindex d39ffbf..22f8d74 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\n@@ -699,10 +699,10 @@ static int mlxsw_sp_port_attr_br_vlan_set(struct mlxsw_sp_port *mlxsw_sp_port,\n \treturn -EINVAL;\n }\n \n-static int mlxsw_sp_port_attr_mc_router_set(struct mlxsw_sp_port *mlxsw_sp_port,\n-\t\t\t\t\t struct switchdev_trans *trans,\n-\t\t\t\t\t struct net_device *orig_dev,\n-\t\t\t\t\t bool is_port_mc_router)\n+static int mlxsw_sp_port_attr_mrouter_set(struct mlxsw_sp_port *mlxsw_sp_port,\n+\t\t\t\t\t struct switchdev_trans *trans,\n+\t\t\t\t\t struct net_device *orig_dev,\n+\t\t\t\t\t bool is_port_mrouter)\n {\n \tstruct mlxsw_sp_bridge_port *bridge_port;\n \tint err;\n@@ -720,12 +720,12 @@ static int mlxsw_sp_port_attr_mc_router_set(struct mlxsw_sp_port *mlxsw_sp_port,\n \n \terr = mlxsw_sp_bridge_port_flood_table_set(mlxsw_sp_port, bridge_port,\n \t\t\t\t\t\t MLXSW_SP_FLOOD_TYPE_MC,\n-\t\t\t\t\t\t is_port_mc_router);\n+\t\t\t\t\t\t is_port_mrouter);\n \tif (err)\n \t\treturn err;\n \n out:\n-\tbridge_port->mrouter = is_port_mc_router;\n+\tbridge_port->mrouter = is_port_mrouter;\n \treturn 0;\n }\n \n@@ -793,9 +793,9 @@ static int mlxsw_sp_port_attr_set(struct net_device *dev,\n \t\t\t\t\t\t attr->u.vlan_filtering);\n \t\tbreak;\n \tcase SWITCHDEV_ATTR_ID_PORT_MROUTER:\n-\t\terr = mlxsw_sp_port_attr_mc_router_set(mlxsw_sp_port, trans,\n-\t\t\t\t\t\t attr->orig_dev,\n-\t\t\t\t\t\t attr->u.mrouter);\n+\t\terr = mlxsw_sp_port_attr_mrouter_set(mlxsw_sp_port, trans,\n+\t\t\t\t\t\t attr->orig_dev,\n+\t\t\t\t\t\t attr->u.mrouter);\n \t\tbreak;\n \tcase SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED:\n \t\terr = mlxsw_sp_port_mc_disabled_set(mlxsw_sp_port, trans,\n","prefixes":["net-next","01/16"]}