Commit be755054 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

ethernet: mlxsw: use eth_hw_addr_gen()

Commit 406f42fa ("net-next: When a bond have a massive amount
of VLANs...") introduced a rbtree for faster Ethernet address look
up. To maintain netdev->dev_addr in this tree we need to make all
the writes to it got through appropriate helpers.
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba3fdfe3
...@@ -200,20 +200,16 @@ static int ...@@ -200,20 +200,16 @@ static int
mlxsw_m_port_dev_addr_get(struct mlxsw_m_port *mlxsw_m_port) mlxsw_m_port_dev_addr_get(struct mlxsw_m_port *mlxsw_m_port)
{ {
struct mlxsw_m *mlxsw_m = mlxsw_m_port->mlxsw_m; struct mlxsw_m *mlxsw_m = mlxsw_m_port->mlxsw_m;
struct net_device *dev = mlxsw_m_port->dev;
char ppad_pl[MLXSW_REG_PPAD_LEN]; char ppad_pl[MLXSW_REG_PPAD_LEN];
u8 addr[ETH_ALEN];
int err; int err;
mlxsw_reg_ppad_pack(ppad_pl, false, 0); mlxsw_reg_ppad_pack(ppad_pl, false, 0);
err = mlxsw_reg_query(mlxsw_m->core, MLXSW_REG(ppad), ppad_pl); err = mlxsw_reg_query(mlxsw_m->core, MLXSW_REG(ppad), ppad_pl);
if (err) if (err)
return err; return err;
mlxsw_reg_ppad_mac_memcpy_from(ppad_pl, dev->dev_addr); mlxsw_reg_ppad_mac_memcpy_from(ppad_pl, addr);
/* The last byte value in base mac address is guaranteed eth_hw_addr_gen(mlxsw_m_port->dev, addr, mlxsw_m_port->module + 1);
* to be such it does not overflow when adding local_port
* value.
*/
dev->dev_addr[ETH_ALEN - 1] += mlxsw_m_port->module + 1;
return 0; return 0;
} }
......
...@@ -316,11 +316,11 @@ static int mlxsw_sp_port_dev_addr_set(struct mlxsw_sp_port *mlxsw_sp_port, ...@@ -316,11 +316,11 @@ static int mlxsw_sp_port_dev_addr_set(struct mlxsw_sp_port *mlxsw_sp_port,
static int mlxsw_sp_port_dev_addr_init(struct mlxsw_sp_port *mlxsw_sp_port) static int mlxsw_sp_port_dev_addr_init(struct mlxsw_sp_port *mlxsw_sp_port)
{ {
struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp; struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
unsigned char *addr = mlxsw_sp_port->dev->dev_addr;
ether_addr_copy(addr, mlxsw_sp->base_mac); eth_hw_addr_gen(mlxsw_sp_port->dev, mlxsw_sp->base_mac,
addr[ETH_ALEN - 1] += mlxsw_sp_port->local_port; mlxsw_sp_port->local_port);
return mlxsw_sp_port_dev_addr_set(mlxsw_sp_port, addr); return mlxsw_sp_port_dev_addr_set(mlxsw_sp_port,
mlxsw_sp_port->dev->dev_addr);
} }
static int mlxsw_sp_port_max_mtu_get(struct mlxsw_sp_port *mlxsw_sp_port, int *p_max_mtu) static int mlxsw_sp_port_max_mtu_get(struct mlxsw_sp_port *mlxsw_sp_port, int *p_max_mtu)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment