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

net: sgi-xp: use eth_hw_addr_set()

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 go through appropriate helpers.
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 704bc986
...@@ -514,6 +514,7 @@ static const struct net_device_ops xpnet_netdev_ops = { ...@@ -514,6 +514,7 @@ static const struct net_device_ops xpnet_netdev_ops = {
static int __init static int __init
xpnet_init(void) xpnet_init(void)
{ {
u8 addr[ETH_ALEN];
int result; int result;
if (!is_uv_system()) if (!is_uv_system())
...@@ -545,15 +546,17 @@ xpnet_init(void) ...@@ -545,15 +546,17 @@ xpnet_init(void)
xpnet_device->min_mtu = XPNET_MIN_MTU; xpnet_device->min_mtu = XPNET_MIN_MTU;
xpnet_device->max_mtu = XPNET_MAX_MTU; xpnet_device->max_mtu = XPNET_MAX_MTU;
memset(addr, 0, sizeof(addr));
/* /*
* Multicast assumes the LSB of the first octet is set for multicast * Multicast assumes the LSB of the first octet is set for multicast
* MAC addresses. We chose the first octet of the MAC to be unlikely * MAC addresses. We chose the first octet of the MAC to be unlikely
* to collide with any vendor's officially issued MAC. * to collide with any vendor's officially issued MAC.
*/ */
xpnet_device->dev_addr[0] = 0x02; /* locally administered, no OUI */ addr[0] = 0x02; /* locally administered, no OUI */
xpnet_device->dev_addr[XPNET_PARTID_OCTET + 1] = xp_partition_id; addr[XPNET_PARTID_OCTET + 1] = xp_partition_id;
xpnet_device->dev_addr[XPNET_PARTID_OCTET + 0] = (xp_partition_id >> 8); addr[XPNET_PARTID_OCTET + 0] = (xp_partition_id >> 8);
eth_hw_addr_set(xpnet_device, addr);
/* /*
* ether_setup() sets this to a multicast device. We are * ether_setup() sets this to a multicast device. We are
......
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