Commit 39830689 authored by Antoine Ténart's avatar Antoine Ténart Committed by David S. Miller

net: pxa168_eth: set the mac address on the Ethernet controller

When changing the MAC address, in addition to updating the dev_addr in
the net_device structure, this patch also update the MAC address
registers (high and low) of the Ethernet controller with the new MAC.
The address stored in these registers is used for IEEE 802.3x Ethernet
flow control, which is already enabled.
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 09f5da1b
...@@ -60,6 +60,8 @@ ...@@ -60,6 +60,8 @@
#define PORT_COMMAND 0x0410 #define PORT_COMMAND 0x0410
#define PORT_STATUS 0x0418 #define PORT_STATUS 0x0418
#define HTPR 0x0428 #define HTPR 0x0428
#define MAC_ADDR_LOW 0x0430
#define MAC_ADDR_HIGH 0x0438
#define SDMA_CONFIG 0x0440 #define SDMA_CONFIG 0x0440
#define SDMA_CMD 0x0448 #define SDMA_CMD 0x0448
#define INT_CAUSE 0x0450 #define INT_CAUSE 0x0450
...@@ -609,11 +611,22 @@ static int pxa168_eth_set_mac_address(struct net_device *dev, void *addr) ...@@ -609,11 +611,22 @@ static int pxa168_eth_set_mac_address(struct net_device *dev, void *addr)
struct sockaddr *sa = addr; struct sockaddr *sa = addr;
struct pxa168_eth_private *pep = netdev_priv(dev); struct pxa168_eth_private *pep = netdev_priv(dev);
unsigned char oldMac[ETH_ALEN]; unsigned char oldMac[ETH_ALEN];
u32 mac_h, mac_l;
if (!is_valid_ether_addr(sa->sa_data)) if (!is_valid_ether_addr(sa->sa_data))
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
memcpy(oldMac, dev->dev_addr, ETH_ALEN); memcpy(oldMac, dev->dev_addr, ETH_ALEN);
memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN); memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN);
mac_h = sa->sa_data[0] << 24;
mac_h |= sa->sa_data[1] << 16;
mac_h |= sa->sa_data[2] << 8;
mac_h |= sa->sa_data[3];
mac_l = sa->sa_data[4] << 8;
mac_l |= sa->sa_data[5];
wrl(pep, MAC_ADDR_HIGH, mac_h);
wrl(pep, MAC_ADDR_LOW, mac_l);
netif_addr_lock_bh(dev); netif_addr_lock_bh(dev);
update_hash_table_mac_address(pep, oldMac, dev->dev_addr); update_hash_table_mac_address(pep, oldMac, dev->dev_addr);
netif_addr_unlock_bh(dev); netif_addr_unlock_bh(dev);
......
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