mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 02:19:51 +00:00
ethernet: sis900: use eth_hw_addr_set()
Commit 406f42fa0d
("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.
Read the address into an array on the stack, then call
eth_hw_addr_set().
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f60e8b06e0
commit
74fad215ee
1 changed files with 3 additions and 1 deletions
|
@ -292,6 +292,7 @@ static int sis630e_get_mac_addr(struct pci_dev *pci_dev,
|
|||
struct net_device *net_dev)
|
||||
{
|
||||
struct pci_dev *isa_bridge = NULL;
|
||||
u8 addr[ETH_ALEN];
|
||||
u8 reg;
|
||||
int i;
|
||||
|
||||
|
@ -308,8 +309,9 @@ static int sis630e_get_mac_addr(struct pci_dev *pci_dev,
|
|||
|
||||
for (i = 0; i < 6; i++) {
|
||||
outb(0x09 + i, 0x70);
|
||||
((u8 *)(net_dev->dev_addr))[i] = inb(0x71);
|
||||
addr[i] = inb(0x71);
|
||||
}
|
||||
eth_hw_addr_set(net_dev, addr);
|
||||
|
||||
pci_write_config_byte(isa_bridge, 0x48, reg & ~0x40);
|
||||
pci_dev_put(isa_bridge);
|
||||
|
|
Loading…
Reference in a new issue