net: dsa: read mac address from DT for slave device
Subsystems (4)
PATCH v2 1/1 net: dsa: read mac address from DT for slave device
From: Xiaofei Shen <[email protected]>
Before creating a slave netdevice, get the mac address from DTS and apply in case it is valid.
Signed-off-by Xiaofei Shen <[email protected]>
Signed-off-by Vinod Koul <[email protected]>
---
v2: Rebase on net-next. The binding patch is already merged
include/net/dsa.h | 1 + net/dsa/dsa2.c | 1 + net/dsa/slave.c | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-)
include/net/dsa.h +1 -0
@@ -140,6 +140,7 @@ struct dsa_port {unsigned int index;const char *name;const struct dsa_port *cpu_dp; +const char *mac;struct device_node *dn;unsigned int ageing_time;u8 stp_state;
net/dsa/dsa2.c +1 -0
@@ -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 :
net/dsa/slave.c +4 -1
@@ -1378,7 +1378,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 ;
Signature · 1 line
2.20.1
From: Vinod Koul <[email protected]>
Date: Fri, 29 Mar 2019 11:04:58 +0530
Quoted 10 lines
From: Xiaofei Shen <[email protected]>
Before creating a slave netdevice, get the mac address from DTS and apply in case it is valid.
Signed-off-by Xiaofei Shen <[email protected]>Signed-off-by Vinod Koul <[email protected]>---
v2: Rebase on net-next. The binding patch is already merged
Applied.