Skip to content

Commit

Permalink
appletalk: Use ether_addr_copy
Browse files Browse the repository at this point in the history
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: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
JoePerches authored and davem330 committed Jan 22, 2014
1 parent 07fc67b commit 90ccb6a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions net/appletalk/aarp.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ struct aarp_entry {
unsigned long expires_at;
struct atalk_addr target_addr;
struct net_device *dev;
char hwaddr[6];
char hwaddr[ETH_ALEN];
unsigned short xmit_count;
struct aarp_entry *next;
};
Expand Down Expand Up @@ -134,7 +134,7 @@ static void __aarp_send_query(struct aarp_entry *a)
eah->pa_len = AARP_PA_ALEN;
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_net = sat->s_net;
Expand Down Expand Up @@ -181,7 +181,7 @@ static void aarp_send_reply(struct net_device *dev, struct atalk_addr *us,
eah->pa_len = AARP_PA_ALEN;
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_net = us->s_net;
Expand All @@ -190,7 +190,7 @@ static void aarp_send_reply(struct net_device *dev, struct atalk_addr *us,
if (!sha)
memset(eah->hw_dst, '\0', ETH_ALEN);
else
memcpy(eah->hw_dst, sha, ETH_ALEN);
ether_addr_copy(eah->hw_dst, sha);

eah->pa_dst_zero = 0;
eah->pa_dst_net = them->s_net;
Expand Down Expand Up @@ -232,7 +232,7 @@ static void aarp_send_probe(struct net_device *dev, struct atalk_addr *us)
eah->pa_len = AARP_PA_ALEN;
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_net = us->s_net;
Expand Down Expand Up @@ -790,7 +790,7 @@ static int aarp_rcv(struct sk_buff *skb, struct net_device *dev,
break;

/* 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);
if (!unresolved_count)
mod_timer(&aarp_timer,
Expand Down

0 comments on commit 90ccb6a

Please sign in to comment.