{"id":816263,"url":"http://patchwork.ozlabs.org/api/patches/816263/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170920141516.1402-8-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-8-jiri@resnulli.us>","list_archive_url":null,"date":"2017-09-20T14:15:07","name":"[net-next,07/16] mlxsw: spectrum_switchdev: Break mid deletion into two function","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"858f8ca618765c5feac565037f1ab7bbbf595ce5","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-8-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/816263/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816263/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=\"x42CL6Uu\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xy1y83Zlsz9s82\n\tfor ;\n\tThu, 21 Sep 2017 00:16:32 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751839AbdITOQV (ORCPT );\n\tWed, 20 Sep 2017 10:16:21 -0400","from mail-wr0-f194.google.com ([209.85.128.194]:37281 \"EHLO\n\tmail-wr0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751678AbdITOPY (ORCPT\n\t); Wed, 20 Sep 2017 10:15:24 -0400","by mail-wr0-f194.google.com with SMTP id u48so1582680wrf.4\n\tfor ; Wed, 20 Sep 2017 07:15:24 -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\t29sm2007603wrz.77.2017.09.20.07.15.23\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tWed, 20 Sep 2017 07:15:23 -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=TqXX1lSMAPZLrgnKN8uNmtC4bclrZdsLWhUz1t5dTPg=;\n\tb=x42CL6UuR/agV+rnczbBosG0dHfaV5X1FAMJskly8+SG9BAHvjpff/fhBFY+zZ8u/n\n\ty/hykGaA+fSxoaltOaPsTdFDibkoDceeaoUTbkdaLu+QXggAA9vWSZ90JRVM8uoRgW5V\n\tBaPAKEaAEYmBzQWsmUoB7YWJ7xgKHfo2ermfadTcsxldER1M7OE/nMtki925o1kRGS/1\n\td+qB5bvK1N/RpQT0xNYSkAWesBsvBRUTiABs9cGLAgcyWgFaLslOio9z3TqNmAv9FFNH\n\t7traE/64QOzMwQ3DlzlJQkG1zfcqHjh7V2GUw3UdQypFBKRrl4/PKuDYBFtw1X5dkOWO\n\tJPUg==","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=TqXX1lSMAPZLrgnKN8uNmtC4bclrZdsLWhUz1t5dTPg=;\n\tb=TeGDabq1D4aqJzCUtlVc6TRWLx4H0+zz6+RKWlh6xFI1t9D7Zh1cpdNrt1rq6dyAkh\n\ttDFfy/kIiRAEZBH20zE7o1K+bOSfhfRZ1vxuazv02DU4vNvaNz0HlEPVeW/FVH7bjo0b\n\ttY0e68eCAvGWaHChH190uZmWdZt0JtBRHP2d3Q1UgDRV61V+oL+gsA3YPMZSzpg/4tsz\n\tyeP/LLqvxj+seEUnEUoQMM6xV5m+oR9pYQhpszGYAxFGH6excTAf065SJsPYH6NEQ+6m\n\tTar3F5rduPI/1Pd+LwL1EG4vBfJVB9zwZcERWv6PUmWqFO2M+pm5ADVdYddqSqdZfqMd\n\tuu+g==","X-Gm-Message-State":"AHPjjUjBsi09BXsXC5GqHNAEcIh8hrPthf8U4YAAIjT3PIP+J8PT5kA7\n\tbfv/Mn2l1jXj3GeGpthdc9ZM9+C8","X-Google-Smtp-Source":"AOwi7QAiv+QA//uqZN5RY/V79eDlQtuV9nG+tAawxDQ1iSghsH8m+fcjcOqDaAD20OhjwH740OawIA==","X-Received":"by 10.223.150.19 with SMTP id b19mr5195967wra.68.1505916923675; \n\tWed, 20 Sep 2017 07:15:23 -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 07/16] mlxsw: spectrum_switchdev: Break mid\n\tdeletion into two function","Date":"Wed, 20 Sep 2017 16:15:07 +0200","Message-Id":"<20170920141516.1402-8-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\nBreak mid deletion into two function, so it will be possible in the future\nto delete a mid entry for other reasons then switchdev command (like port\ndeletion).\n\nSigned-off-by: Nogah Frankel \nSigned-off-by: Jiri Pirko \n---\n .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 32 ++++++++++++++--------\n 1 file changed, 20 insertions(+), 12 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\nindex 9dd05d8..7f622de 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\n@@ -1468,6 +1468,25 @@ static int mlxsw_sp_port_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port,\n \treturn 0;\n }\n \n+static int\n+__mlxsw_sp_port_mdb_del(struct mlxsw_sp_port *mlxsw_sp_port,\n+\t\t\tstruct mlxsw_sp_bridge_port *bridge_port,\n+\t\t\tstruct mlxsw_sp_mid *mid)\n+{\n+\tstruct net_device *dev = mlxsw_sp_port->dev;\n+\tint err;\n+\n+\terr = mlxsw_sp_port_smid_set(mlxsw_sp_port, mid->mid, false);\n+\tif (err)\n+\t\tnetdev_err(dev, \"Unable to remove port from SMID\\n\");\n+\n+\terr = mlxsw_sp_port_remove_from_mid(mlxsw_sp_port, mid);\n+\tif (err)\n+\t\tnetdev_err(dev, \"Unable to remove MC SFD\\n\");\n+\n+\treturn err;\n+}\n+\n static int mlxsw_sp_port_mdb_del(struct mlxsw_sp_port *mlxsw_sp_port,\n \t\t\t\t const struct switchdev_obj_port_mdb *mdb)\n {\n@@ -1479,8 +1498,6 @@ static int mlxsw_sp_port_mdb_del(struct mlxsw_sp_port *mlxsw_sp_port,\n \tstruct mlxsw_sp_bridge_port *bridge_port;\n \tstruct mlxsw_sp_mid *mid;\n \tu16 fid_index;\n-\tu16 mid_idx;\n-\tint err = 0;\n \n \tbridge_port = mlxsw_sp_bridge_port_find(mlxsw_sp->bridge, orig_dev);\n \tif (!bridge_port)\n@@ -1501,16 +1518,7 @@ static int mlxsw_sp_port_mdb_del(struct mlxsw_sp_port *mlxsw_sp_port,\n \t\treturn -EINVAL;\n \t}\n \n-\terr = mlxsw_sp_port_smid_set(mlxsw_sp_port, mid->mid, false);\n-\tif (err)\n-\t\tnetdev_err(dev, \"Unable to remove port from SMID\\n\");\n-\n-\tmid_idx = mid->mid;\n-\terr = mlxsw_sp_port_remove_from_mid(mlxsw_sp_port, mid);\n-\tif (err)\n-\t\tnetdev_err(dev, \"Unable to remove MC SFD\\n\");\n-\n-\treturn err;\n+\treturn __mlxsw_sp_port_mdb_del(mlxsw_sp_port, bridge_port, mid);\n }\n \n static int mlxsw_sp_port_obj_del(struct net_device *dev,\n","prefixes":["net-next","07/16"]}