Commit 90ccb6aa authored by Joe Perches's avatar Joe Perches Committed by David S. Miller

appletalk: Use ether_addr_copy

Use ether_addr_copy instead of memcpy(a, b, ETH_ALEN) to
save some cycles on arm and powerpc.

Convert struct aarp_entry.hwaddr[6] to hwaddr[ETH_ALEN].
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 07fc67be
...@@ -67,7 +67,7 @@ struct aarp_entry { ...@@ -67,7 +67,7 @@ struct aarp_entry {
unsigned long expires_at; unsigned long expires_at;
struct atalk_addr target_addr; struct atalk_addr target_addr;
struct net_device *dev; struct net_device *dev;
char hwaddr[6]; char hwaddr[ETH_ALEN];
unsigned short xmit_count; unsigned short xmit_count;
struct aarp_entry *next; struct aarp_entry *next;
}; };
...@@ -134,7 +134,7 @@ static void __aarp_send_query(struct aarp_entry *a) ...@@ -134,7 +134,7 @@ static void __aarp_send_query(struct aarp_entry *a)
eah->pa_len = AARP_PA_ALEN; eah->pa_len = AARP_PA_ALEN;
eah->function = htons(AARP_REQUEST); eah->function = htons(AARP_REQUEST);
memcpy(eah->hw_src, dev->dev_addr, ETH_ALEN); ether_addr_copy(eah->hw_src, dev->dev_addr);
eah->pa_src_zero = 0; eah->pa_src_zero = 0;
eah->pa_src_net = sat->s_net; eah->pa_src_net = sat->s_net;
...@@ -181,7 +181,7 @@ static void aarp_send_reply(struct net_device *dev, struct atalk_addr *us, ...@@ -181,7 +181,7 @@ static void aarp_send_reply(struct net_device *dev, struct atalk_addr *us,
eah->pa_len = AARP_PA_ALEN; eah->pa_len = AARP_PA_ALEN;
eah->function = htons(AARP_REPLY); eah->function = htons(AARP_REPLY);
memcpy(eah->hw_src, dev->dev_addr, ETH_ALEN); ether_addr_copy(eah->hw_src, dev->dev_addr);
eah->pa_src_zero = 0; eah->pa_src_zero = 0;
eah->pa_src_net = us->s_net; eah->pa_src_net = us->s_net;
...@@ -190,7 +190,7 @@ static void aarp_send_reply(struct net_device *dev, struct atalk_addr *us, ...@@ -190,7 +190,7 @@ static void aarp_send_reply(struct net_device *dev, struct atalk_addr *us,
if (!sha) if (!sha)
memset(eah->hw_dst, '\0', ETH_ALEN); memset(eah->hw_dst, '\0', ETH_ALEN);
else else
memcpy(eah->hw_dst, sha, ETH_ALEN); ether_addr_copy(eah->hw_dst, sha);
eah->pa_dst_zero = 0; eah->pa_dst_zero = 0;
eah->pa_dst_net = them->s_net; eah->pa_dst_net = them->s_net;
...@@ -232,7 +232,7 @@ static void aarp_send_probe(struct net_device *dev, struct atalk_addr *us) ...@@ -232,7 +232,7 @@ static void aarp_send_probe(struct net_device *dev, struct atalk_addr *us)
eah->pa_len = AARP_PA_ALEN; eah->pa_len = AARP_PA_ALEN;
eah->function = htons(AARP_PROBE); eah->function = htons(AARP_PROBE);
memcpy(eah->hw_src, dev->dev_addr, ETH_ALEN); ether_addr_copy(eah->hw_src, dev->dev_addr);
eah->pa_src_zero = 0; eah->pa_src_zero = 0;
eah->pa_src_net = us->s_net; eah->pa_src_net = us->s_net;
...@@ -790,7 +790,7 @@ static int aarp_rcv(struct sk_buff *skb, struct net_device *dev, ...@@ -790,7 +790,7 @@ static int aarp_rcv(struct sk_buff *skb, struct net_device *dev,
break; break;
/* We can fill one in - this is good. */ /* We can fill one in - this is good. */
memcpy(a->hwaddr, ea->hw_src, ETH_ALEN); ether_addr_copy(a->hwaddr, ea->hw_src);
__aarp_resolved(&unresolved[hash], a, hash); __aarp_resolved(&unresolved[hash], a, hash);
if (!unresolved_count) if (!unresolved_count)
mod_timer(&aarp_timer, mod_timer(&aarp_timer,
......
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