{"id":817736,"url":"http://patchwork.ozlabs.org/api/patches/817736/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170922230156.19521-2-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":"<20170922230156.19521-2-vivien.didelot@savoirfairelinux.com>","list_archive_url":null,"date":"2017-09-22T23:01:55","name":"[net-next,v3,1/2] net: dsa: make slave close symmetrical to open","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"ed8bc6f6c78024aeea5d8a9002f4fd5b13d28f72","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/20170922230156.19521-2-vivien.didelot@savoirfairelinux.com/mbox/","series":[{"id":4721,"url":"http://patchwork.ozlabs.org/api/series/4721/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4721","date":"2017-09-22T23:01:56","name":"net: dsa: port enabling","version":3,"mbox":"http://patchwork.ozlabs.org/series/4721/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817736/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817736/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 3xzTcR0cxcz9sRm\n\tfor ;\n\tSat, 23 Sep 2017 09:06:15 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752585AbdIVXFq (ORCPT );\n\tFri, 22 Sep 2017 19:05:46 -0400","from mail.savoirfairelinux.com ([208.88.110.44]:35330 \"EHLO\n\tmail.savoirfairelinux.com\" rhost-flags-OK-OK-OK-OK) by\n\tvger.kernel.org with ESMTP id S1752472AbdIVXFo (ORCPT\n\t); Fri, 22 Sep 2017 19:05:44 -0400","from localhost (localhost [127.0.0.1])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTP id AF2159C2D4B;\n\tFri, 22 Sep 2017 19:05:38 -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 W5crL_XvgAIn; Fri, 22 Sep 2017 19:05:37 -0400 (EDT)","from localhost (localhost [127.0.0.1])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTP id 812E09C2D48;\n\tFri, 22 Sep 2017 19:05:37 -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 6IGXgtvt4Mlz; Fri, 22 Sep 2017 19:05:37 -0400 (EDT)","from weeman.mtl.sfl (unknown [192.168.50.91])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTPSA id 507559C1A3E;\n\tFri, 22 Sep 2017 19:05:37 -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 v3 1/2] net: dsa: make slave close symmetrical to\n\topen","Date":"Fri, 22 Sep 2017 19:01:55 -0400","Message-Id":"<20170922230156.19521-2-vivien.didelot@savoirfairelinux.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170922230156.19521-1-vivien.didelot@savoirfairelinux.com>","References":"<20170922230156.19521-1-vivien.didelot@savoirfairelinux.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"The DSA slave open function configures the unicast MAC addresses on the\nmaster device, enable the switch port, change its STP state, then start\nthe PHY device.\n\nMake the close function symmetric, by first stopping the PHY device,\nthen changing the STP state, disabling the switch port and restore the\nmaster device.\n\nSigned-off-by: Vivien Didelot \nReviewed-by: Florian Fainelli \nReviewed-by: Andrew Lunn \n---\n net/dsa/slave.c | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)","diff":"diff --git a/net/dsa/slave.c b/net/dsa/slave.c\nindex 02ace7d462c4..c2bb48579032 100644\n--- a/net/dsa/slave.c\n+++ b/net/dsa/slave.c\n@@ -133,6 +133,11 @@ static int dsa_slave_close(struct net_device *dev)\n \tif (p->phy)\n \t\tphy_stop(p->phy);\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, p->phy);\n+\n \tdev_mc_unsync(master, dev);\n \tdev_uc_unsync(master, dev);\n \tif (dev->flags & IFF_ALLMULTI)\n@@ -143,11 +148,6 @@ static int dsa_slave_close(struct net_device *dev)\n \tif (!ether_addr_equal(dev->dev_addr, master->dev_addr))\n \t\tdev_uc_del(master, dev->dev_addr);\n \n-\tif (ds->ops->port_disable)\n-\t\tds->ops->port_disable(ds, p->dp->index, p->phy);\n-\n-\tdsa_port_set_state_now(p->dp, BR_STATE_DISABLED);\n-\n \treturn 0;\n }\n \n","prefixes":["net-next","v3","1/2"]}