diff options
| author |   Joe Perches <joe@perches.com> | 2013-10-01 19:04:40 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-10-02 17:04:45 -0400 |
| commit | d458cdf712e0c671e8e819abb16ecd6e44f9daec (patch) | |
| tree | ff93ce90fee219f2690a4f51f985815422664b7a /drivers/net/ethernet/jme.c | |
| parent | include/linux/skbuff.h: move CONFIG_XFRM check inside the skb_sec_path() (diff) | |
| download | linux-dev-d458cdf712e0c671e8e819abb16ecd6e44f9daec.tar.xz linux-dev-d458cdf712e0c671e8e819abb16ecd6e44f9daec.zip | |
net:drivers/net: Miscellaneous conversions to ETH_ALEN
Convert the memset/memcpy uses of 6 to ETH_ALEN
where appropriate.
Also convert some struct definitions and u8 array
declarations of [6] to ETH_ALEN.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/jme.c | 4 |
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 jme_load_macaddr(struct net_device *netdev) { struct jme_adapter *jme = netdev_priv(netdev); - unsigned char macaddr[6]; + unsigned char macaddr[ETH_ALEN]; u32 val; spin_lock_bh(&jme->macaddr_lock); @@ -321,7 +321,7 @@ jme_load_macaddr(struct net_device *netdev) val = jread32(jme, JME_RXUMA_HI); macaddr[4] = (val >> 0) & 0xFF; macaddr[5] = (val >> 8) & 0xFF; - memcpy(netdev->dev_addr, macaddr, 6); + memcpy(netdev->dev_addr, macaddr, ETH_ALEN); spin_unlock_bh(&jme->macaddr_lock); } |