{"id":805883,"url":"http://patchwork.ozlabs.org/api/patches/805883/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170825141420.14027-3-antoine.tenart@free-electrons.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":"<20170825141420.14027-3-antoine.tenart@free-electrons.com>","list_archive_url":null,"date":"2017-08-25T14:14:18","name":"[net,v2,2/4] net: mvpp2: move the mac retrieval/copy logic into its own function","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"c0beb491cb1063614965bd28243684f31b4f3c38","submitter":{"id":61603,"url":"http://patchwork.ozlabs.org/api/people/61603/?format=json","name":"Antoine Tenart","email":"antoine.tenart@free-electrons.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/20170825141420.14027-3-antoine.tenart@free-electrons.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/805883/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/805883/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 3xf38h6s7jz9sPs\n\tfor ;\n\tSat, 26 Aug 2017 00:15:16 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933053AbdHYOPO (ORCPT );\n\tFri, 25 Aug 2017 10:15:14 -0400","from mail.free-electrons.com ([62.4.15.54]:43085 \"EHLO\n\tmail.free-electrons.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1756521AbdHYOPN (ORCPT\n\t); Fri, 25 Aug 2017 10:15:13 -0400","by mail.free-electrons.com (Postfix, from userid 110)\n\tid 4C10B20957; Fri, 25 Aug 2017 16:15:11 +0200 (CEST)","from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr\n\t[90.63.216.87])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id 1F39B20911;\n\tFri, 25 Aug 2017 16:15:01 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on\n\tmail.free-electrons.com","X-Spam-Level":"","X-Spam-Status":"No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT,\n\tURIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0","From":"Antoine Tenart ","To":"davem@davemloft.net, thomas.petazzoni@free-electrons.com","Cc":"Antoine Tenart , andrew@lunn.ch,\n\tgregory.clement@free-electrons.com, nadavh@marvell.com,\n\tlinux@armlinux.org.uk, linux-kernel@vger.kernel.org,\n\tmw@semihalf.com, stefanc@marvell.com, netdev@vger.kernel.org","Subject":"[PATCH net v2 2/4] net: mvpp2: move the mac retrieval/copy logic\n\tinto its own function","Date":"Fri, 25 Aug 2017 16:14:18 +0200","Message-Id":"<20170825141420.14027-3-antoine.tenart@free-electrons.com>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170825141420.14027-1-antoine.tenart@free-electrons.com>","References":"<20170825141420.14027-1-antoine.tenart@free-electrons.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"The MAC retrieval has a quite complicated logic (which is broken). Moves\nit to its own function to prepare for patches fixing its logic, so that\nreviews are easier.\n\nSigned-off-by: Antoine Tenart \n---\n drivers/net/ethernet/marvell/mvpp2.c | 45 +++++++++++++++++++++---------------\n 1 file changed, 27 insertions(+), 18 deletions(-)","diff":"diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c\nindex 4d598ca8503a..a1593134ed96 100644\n--- a/drivers/net/ethernet/marvell/mvpp2.c\n+++ b/drivers/net/ethernet/marvell/mvpp2.c\n@@ -6492,6 +6492,31 @@ static int mvpp2_port_init(struct mvpp2_port *port)\n \treturn err;\n }\n \n+static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv,\n+\t\t\t\t struct device_node *port_node,\n+\t\t\t\t char **mac_from)\n+{\n+\tstruct mvpp2_port *port = netdev_priv(dev);\n+\tchar hw_mac_addr[ETH_ALEN] = {0};\n+\tconst char *dt_mac_addr;\n+\n+\tdt_mac_addr = of_get_mac_address(port_node);\n+\tif (dt_mac_addr && is_valid_ether_addr(dt_mac_addr)) {\n+\t\t*mac_from = \"device tree\";\n+\t\tether_addr_copy(dev->dev_addr, dt_mac_addr);\n+\t} else {\n+\t\tif (priv->hw_version == MVPP21)\n+\t\t\tmvpp21_get_mac_address(port, hw_mac_addr);\n+\t\tif (is_valid_ether_addr(hw_mac_addr)) {\n+\t\t\t*mac_from = \"hardware\";\n+\t\t\tether_addr_copy(dev->dev_addr, hw_mac_addr);\n+\t\t} else {\n+\t\t\t*mac_from = \"random\";\n+\t\t\teth_hw_addr_random(dev);\n+\t\t}\n+\t}\n+}\n+\n /* Ports initialization */\n static int mvpp2_port_probe(struct platform_device *pdev,\n \t\t\t struct device_node *port_node,\n@@ -6502,9 +6527,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,\n \tstruct mvpp2_port_pcpu *port_pcpu;\n \tstruct net_device *dev;\n \tstruct resource *res;\n-\tconst char *dt_mac_addr;\n-\tconst char *mac_from;\n-\tchar hw_mac_addr[ETH_ALEN] = {0};\n+\tchar *mac_from = \"\";\n \tu32 id;\n \tint features;\n \tint phy_mode;\n@@ -6585,21 +6608,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,\n \t\tgoto err_free_irq;\n \t}\n \n-\tdt_mac_addr = of_get_mac_address(port_node);\n-\tif (dt_mac_addr && is_valid_ether_addr(dt_mac_addr)) {\n-\t\tmac_from = \"device tree\";\n-\t\tether_addr_copy(dev->dev_addr, dt_mac_addr);\n-\t} else {\n-\t\tif (priv->hw_version == MVPP21)\n-\t\t\tmvpp21_get_mac_address(port, hw_mac_addr);\n-\t\tif (is_valid_ether_addr(hw_mac_addr)) {\n-\t\t\tmac_from = \"hardware\";\n-\t\t\tether_addr_copy(dev->dev_addr, hw_mac_addr);\n-\t\t} else {\n-\t\t\tmac_from = \"random\";\n-\t\t\teth_hw_addr_random(dev);\n-\t\t}\n-\t}\n+\tmvpp2_port_copy_mac_addr(dev, priv, port_node, &mac_from);\n \n \tport->tx_ring_size = MVPP2_MAX_TXD;\n \tport->rx_ring_size = MVPP2_MAX_RXD;\n","prefixes":["net","v2","2/4"]}