Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 773d2021 authored by Francois Romieu's avatar Francois Romieu Committed by Jeff Garzik
Browse files

r8169: mac address change support 



Merged from Realtek's r8169-6.001 driver.

I have added some locking to protect against the arp monitoring
timer in the bonding driver. Accessing the configuration registers
is otherwise performed under RTNL locking.

Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
parent 96b9709c

drivers/net/r8169.c

+36 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ static struct { 


enum rtl_registers {

	MAC0		= 0,	/* Ethernet hardware address. */

	MAC4		= 4,

	MAR0		= 8,	/* Multicast filter. */

	CounterAddrLow		= 0x10,

	CounterAddrHigh		= 0x14,
@@ -1379,6 +1380,40 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp) 
		printk(KERN_INFO PFX "%s: TBI auto-negotiating\n", dev->name);

}



static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr)

{

	void __iomem *ioaddr = tp->mmio_addr;

	u32 high;

	u32 low;



	low  = addr[0] | (addr[1] << 8) | (addr[2] << 16) | (addr[3] << 24);

	high = addr[4] | (addr[5] << 8);



	spin_lock_irq(&tp->lock);



	RTL_W8(Cfg9346, Cfg9346_Unlock);

	RTL_W32(MAC0, low);

	RTL_W32(MAC4, high);

	RTL_W8(Cfg9346, Cfg9346_Lock);



	spin_unlock_irq(&tp->lock);

}



static int rtl_set_mac_address(struct net_device *dev, void *p)

{

	struct rtl8169_private *tp = netdev_priv(dev);

	struct sockaddr *addr = p;



	if (!is_valid_ether_addr(addr->sa_data))

		return -EADDRNOTAVAIL;



	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);



	rtl_rar_set(tp, dev->dev_addr);



	return 0;

}



static int rtl8169_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

{

	struct rtl8169_private *tp = netdev_priv(dev);
@@ -1610,6 +1645,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	dev->irq = pdev->irq;

	dev->base_addr = (unsigned long) ioaddr;

	dev->change_mtu = rtl8169_change_mtu;

	dev->set_mac_address = rtl_set_mac_address;



#ifdef CONFIG_R8169_NAPI

	dev->poll = rtl8169_poll;