aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/jme.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/jme.c')
-rw-r--r--drivers/net/ethernet/jme.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c
index 23de82a9da82..b56d2a29cd0e 100644
--- a/drivers/net/ethernet/jme.c
+++ b/drivers/net/ethernet/jme.c
@@ -309,7 +309,7 @@ static void
309jme_load_macaddr(struct net_device *netdev) 309jme_load_macaddr(struct net_device *netdev)
310{ 310{
311 struct jme_adapter *jme = netdev_priv(netdev); 311 struct jme_adapter *jme = netdev_priv(netdev);
312 unsigned char macaddr[6]; 312 unsigned char macaddr[ETH_ALEN];
313 u32 val; 313 u32 val;
314 314
315 spin_lock_bh(&jme->macaddr_lock); 315 spin_lock_bh(&jme->macaddr_lock);
@@ -321,7 +321,7 @@ jme_load_macaddr(struct net_device *netdev)
321 val = jread32(jme, JME_RXUMA_HI); 321 val = jread32(jme, JME_RXUMA_HI);
322 macaddr[4] = (val >> 0) & 0xFF; 322 macaddr[4] = (val >> 0) & 0xFF;
323 macaddr[5] = (val >> 8) & 0xFF; 323 macaddr[5] = (val >> 8) & 0xFF;
324 memcpy(netdev->dev_addr, macaddr, 6); 324 memcpy(netdev->dev_addr, macaddr, ETH_ALEN);
325 spin_unlock_bh(&jme->macaddr_lock); 325 spin_unlock_bh(&jme->macaddr_lock);
326} 326}
327 327