Commit f60e8b06 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

ethernet: sis190: 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 got through appropriate helpers.

Read the address into an array on the stack, then call
eth_hw_addr_set().

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 15fa05bf

drivers/net/ethernet/sis/sis190.c

+3 −1
Original line number Diff line number Diff line
@@ -1631,6 +1631,7 @@ static int sis190_get_mac_addr_from_apc(struct pci_dev *pdev, 
	static const u16 ids[] = { 0x0965, 0x0966, 0x0968 };

	struct sis190_private *tp = netdev_priv(dev);

	struct pci_dev *isa_bridge;

	u8 addr[ETH_ALEN];

	u8 reg, tmp8;

	unsigned int i;
@@ -1659,8 +1660,9 @@ static int sis190_get_mac_addr_from_apc(struct pci_dev *pdev, 


        for (i = 0; i < ETH_ALEN; i++) {

                outb(0x9 + i, 0x78);

                dev->dev_addr[i] = inb(0x79);

                addr[i] = inb(0x79);

        }

	eth_hw_addr_set(dev, addr);



	outb(0x12, 0x78);

	reg = inb(0x79);