diff options
| author |   Xiaofei Shen <xiaofeis@codeaurora.org> | 2019-03-29 11:04:58 +0530 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-04-01 14:57:32 -0700 |
| commit | a2c7023f7075ca9b80f944d3f20f60e6574538e2 (patch) | |
| tree | f233ec3606dfa952650e02d2743fed1fa74f83bd /net/dsa | |
| parent | tcp: fix tcp_inet6_sk() for 32bit kernels (diff) | |
| download | linux-dev-a2c7023f7075ca9b80f944d3f20f60e6574538e2.tar.xz linux-dev-a2c7023f7075ca9b80f944d3f20f60e6574538e2.zip | |
net: dsa: read mac address from DT for slave device
Before creating a slave netdevice, get the mac address from DTS and
apply in case it is valid.
Signed-off-by: Xiaofei Shen <xiaofeis@codeaurora.org>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/dsa2.c | 1 | ||||
| -rw-r--r-- | net/dsa/slave.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index fe0a6197db9c..0e1cce460406 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -266,6 +266,7 @@ static int dsa_port_setup(struct dsa_port *dp) return 0; memset(&dp->devlink_port, 0, sizeof(dp->devlink_port)); + dp->mac = of_get_mac_address(dp->dn); switch (dp->type) { case DSA_PORT_TYPE_CPU: diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 80be8e86c82d..f83525909c57 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1393,7 +1393,10 @@ int dsa_slave_create(struct dsa_port *port) NETIF_F_HW_VLAN_CTAG_FILTER; slave_dev->hw_features |= NETIF_F_HW_TC; slave_dev->ethtool_ops = &dsa_slave_ethtool_ops; - eth_hw_addr_inherit(slave_dev, master); + if (port->mac && is_valid_ether_addr(port->mac)) + ether_addr_copy(slave_dev->dev_addr, port->mac); + else + eth_hw_addr_inherit(slave_dev, master); slave_dev->priv_flags |= IFF_NO_QUEUE; slave_dev->netdev_ops = &dsa_slave_netdev_ops; slave_dev->min_mtu = 0; |