{"id":817680,"url":"http://patchwork.ozlabs.org/api/patches/817680/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170922194045.18814-4-vivien.didelot@savoirfairelinux.com/","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":"<20170922194045.18814-4-vivien.didelot@savoirfairelinux.com>","list_archive_url":null,"date":"2017-09-22T19:40:45","name":"[net-next,v2,3/3] net: dsa: add port enable and disable helpers","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"f972eea834d1a81c582290069dd76a8c2a064aa7","submitter":{"id":15889,"url":"http://patchwork.ozlabs.org/api/people/15889/?format=json","name":"Vivien Didelot","email":"vivien.didelot@savoirfairelinux.com"},"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/20170922194045.18814-4-vivien.didelot@savoirfairelinux.com/mbox/","series":[{"id":4699,"url":"http://patchwork.ozlabs.org/api/series/4699/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4699","date":"2017-09-22T19:40:43","name":"net: dsa: use slave device phydev","version":2,"mbox":"http://patchwork.ozlabs.org/series/4699/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817680/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817680/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=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xzP8q47CCz9sPr\n\tfor ;\n\tSat, 23 Sep 2017 05:45:31 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752071AbdIVTpC (ORCPT );\n\tFri, 22 Sep 2017 15:45:02 -0400","from mail.savoirfairelinux.com ([208.88.110.44]:53366 \"EHLO\n\tmail.savoirfairelinux.com\" rhost-flags-OK-OK-OK-OK) by\n\tvger.kernel.org with ESMTP id S1751871AbdIVTo0 (ORCPT\n\t); Fri, 22 Sep 2017 15:44:26 -0400","from localhost (localhost [127.0.0.1])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTP id 277829C2D13;\n\tFri, 22 Sep 2017 15:44:26 -0400 (EDT)","from mail.savoirfairelinux.com ([127.0.0.1])\n\tby localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new,\n\tport 10032)\n\twith ESMTP id EYNP1ssTdi35; Fri, 22 Sep 2017 15:44:24 -0400 (EDT)","from localhost (localhost [127.0.0.1])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTP id D84A49C2D12;\n\tFri, 22 Sep 2017 15:44:24 -0400 (EDT)","from mail.savoirfairelinux.com ([127.0.0.1])\n\tby localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new,\n\tport 10026)\n\twith ESMTP id omX_2Ue5HTO1; Fri, 22 Sep 2017 15:44:24 -0400 (EDT)","from weeman.mtl.sfl (unknown [192.168.49.104])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTPSA id B23E69C2D08;\n\tFri, 22 Sep 2017 15:44:24 -0400 (EDT)"],"X-Virus-Scanned":"amavisd-new at mail.savoirfairelinux.com","From":"Vivien Didelot ","To":"netdev@vger.kernel.org","Cc":"linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com,\n\t\"David S. Miller\" ,\n\tFlorian Fainelli , Andrew Lunn ,\n\tVivien Didelot ","Subject":"[PATCH net-next v2 3/3] net: dsa: add port enable and disable\n\thelpers","Date":"Fri, 22 Sep 2017 15:40:45 -0400","Message-Id":"<20170922194045.18814-4-vivien.didelot@savoirfairelinux.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170922194045.18814-1-vivien.didelot@savoirfairelinux.com>","References":"<20170922194045.18814-1-vivien.didelot@savoirfairelinux.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Provide dsa_port_enable and dsa_port_disable helpers to respectively\nenable and disable a switch port. This makes the dsa_port_set_state_now\nhelper static.\n\nSigned-off-by: Vivien Didelot \nReviewed-by: Florian Fainelli \nReviewed-by: Andrew Lunn \n---\n net/dsa/dsa_priv.h | 3 ++-\n net/dsa/port.c | 31 ++++++++++++++++++++++++++++++-\n net/dsa/slave.c | 19 +++++--------------\n 3 files changed, 37 insertions(+), 16 deletions(-)","diff":"diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h\nindex 9803952a5b40..0298a0f6a349 100644\n--- a/net/dsa/dsa_priv.h\n+++ b/net/dsa/dsa_priv.h\n@@ -117,7 +117,8 @@ void dsa_master_ethtool_restore(struct net_device *dev);\n /* port.c */\n int dsa_port_set_state(struct dsa_port *dp, u8 state,\n \t\t struct switchdev_trans *trans);\n-void dsa_port_set_state_now(struct dsa_port *dp, u8 state);\n+int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy);\n+void dsa_port_disable(struct dsa_port *dp, struct phy_device *phy);\n int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br);\n void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br);\n int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering,\ndiff --git a/net/dsa/port.c b/net/dsa/port.c\nindex 76d43a82d397..72c8dbd3d3f2 100644\n--- a/net/dsa/port.c\n+++ b/net/dsa/port.c\n@@ -56,7 +56,7 @@ int dsa_port_set_state(struct dsa_port *dp, u8 state,\n \treturn 0;\n }\n \n-void dsa_port_set_state_now(struct dsa_port *dp, u8 state)\n+static void dsa_port_set_state_now(struct dsa_port *dp, u8 state)\n {\n \tint err;\n \n@@ -65,6 +65,35 @@ void dsa_port_set_state_now(struct dsa_port *dp, u8 state)\n \t\tpr_err(\"DSA: failed to set STP state %u (%d)\\n\", state, err);\n }\n \n+int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy)\n+{\n+\tu8 stp_state = dp->bridge_dev ? BR_STATE_BLOCKING : BR_STATE_FORWARDING;\n+\tstruct dsa_switch *ds = dp->ds;\n+\tint port = dp->index;\n+\tint err;\n+\n+\tif (ds->ops->port_enable) {\n+\t\terr = ds->ops->port_enable(ds, port, phy);\n+\t\tif (err)\n+\t\t\treturn err;\n+\t}\n+\n+\tdsa_port_set_state_now(dp, stp_state);\n+\n+\treturn 0;\n+}\n+\n+void dsa_port_disable(struct dsa_port *dp, struct phy_device *phy)\n+{\n+\tstruct dsa_switch *ds = dp->ds;\n+\tint port = dp->index;\n+\n+\tdsa_port_set_state_now(dp, BR_STATE_DISABLED);\n+\n+\tif (ds->ops->port_disable)\n+\t\tds->ops->port_disable(ds, port, phy);\n+}\n+\n int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br)\n {\n \tstruct dsa_notifier_bridge_info info = {\ndiff --git a/net/dsa/slave.c b/net/dsa/slave.c\nindex 0aab29928152..4ea1c6eb0da8 100644\n--- a/net/dsa/slave.c\n+++ b/net/dsa/slave.c\n@@ -73,9 +73,7 @@ static int dsa_slave_open(struct net_device *dev)\n {\n \tstruct dsa_slave_priv *p = netdev_priv(dev);\n \tstruct dsa_port *dp = p->dp;\n-\tstruct dsa_switch *ds = dp->ds;\n \tstruct net_device *master = dsa_master_netdev(p);\n-\tu8 stp_state = dp->bridge_dev ? BR_STATE_BLOCKING : BR_STATE_FORWARDING;\n \tint err;\n \n \tif (!(master->flags & IFF_UP))\n@@ -98,13 +96,9 @@ static int dsa_slave_open(struct net_device *dev)\n \t\t\tgoto clear_allmulti;\n \t}\n \n-\tif (ds->ops->port_enable) {\n-\t\terr = ds->ops->port_enable(ds, p->dp->index, dev->phydev);\n-\t\tif (err)\n-\t\t\tgoto clear_promisc;\n-\t}\n-\n-\tdsa_port_set_state_now(p->dp, stp_state);\n+\terr = dsa_port_enable(dp, dev->phydev);\n+\tif (err)\n+\t\tgoto clear_promisc;\n \n \tif (dev->phydev)\n \t\tphy_start(dev->phydev);\n@@ -128,15 +122,12 @@ static int dsa_slave_close(struct net_device *dev)\n {\n \tstruct dsa_slave_priv *p = netdev_priv(dev);\n \tstruct net_device *master = dsa_master_netdev(p);\n-\tstruct dsa_switch *ds = p->dp->ds;\n+\tstruct dsa_port *dp = p->dp;\n \n \tif (dev->phydev)\n \t\tphy_stop(dev->phydev);\n \n-\tdsa_port_set_state_now(p->dp, BR_STATE_DISABLED);\n-\n-\tif (ds->ops->port_disable)\n-\t\tds->ops->port_disable(ds, p->dp->index, dev->phydev);\n+\tdsa_port_disable(dp, dev->phydev);\n \n \tdev_mc_unsync(master, dev);\n \tdev_uc_unsync(master, dev);\n","prefixes":["net-next","v2","3/3"]}