diff options
author | Joe Perches <joe@perches.com> | 2014-01-20 12:52:15 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-21 21:13:04 -0500 |
commit | 90ccb6aa407a906886b0d372996e71c4ee78eeca (patch) | |
tree | f7063cd7c8b6f16e897ffd7b4bba12d2bac5bd5d /net/appletalk | |
parent | 07fc67befd2e843da8ad01785d559d9c257d7fd4 (diff) |
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: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/appletalk')
-rw-r--r-- | net/appletalk/aarp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c index 690356fa52b9..d0b7be15dbb9 100644 --- a/net/appletalk/aarp.c +++ b/net/appletalk/aarp.c | |||
@@ -67,7 +67,7 @@ struct aarp_entry { | |||
67 | unsigned long expires_at; | 67 | unsigned long expires_at; |
68 | struct atalk_addr target_addr; | 68 | struct atalk_addr target_addr; |
69 | struct net_device *dev; | 69 | struct net_device *dev; |
70 | char hwaddr[6]; | 70 | char hwaddr[ETH_ALEN]; |
71 | unsigned short xmit_count; | 71 | unsigned short xmit_count; |
72 | struct aarp_entry *next; | 72 | struct aarp_entry *next; |
73 | }; | 73 | }; |
@@ -134,7 +134,7 @@ static void __aarp_send_query(struct aarp_entry *a) | |||
134 | eah->pa_len = AARP_PA_ALEN; | 134 | eah->pa_len = AARP_PA_ALEN; |
135 | eah->function = htons(AARP_REQUEST); | 135 | eah->function = htons(AARP_REQUEST); |
136 | 136 | ||
137 | memcpy(eah->hw_src, dev->dev_addr, ETH_ALEN); | 137 | ether_addr_copy(eah->hw_src, dev->dev_addr); |
138 | 138 | ||
139 | eah->pa_src_zero = 0; | 139 | eah->pa_src_zero = 0; |
140 | eah->pa_src_net = sat->s_net; | 140 | 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 | eah->pa_len = AARP_PA_ALEN; | 181 | eah->pa_len = AARP_PA_ALEN; |
182 | eah->function = htons(AARP_REPLY); | 182 | eah->function = htons(AARP_REPLY); |
183 | 183 | ||
184 | memcpy(eah->hw_src, dev->dev_addr, ETH_ALEN); | 184 | ether_addr_copy(eah->hw_src, dev->dev_addr); |
185 | 185 | ||
186 | eah->pa_src_zero = 0; | 186 | eah->pa_src_zero = 0; |
187 | eah->pa_src_net = us->s_net; | 187 | 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 | if (!sha) | 190 | if (!sha) |
191 | memset(eah->hw_dst, '\0', ETH_ALEN); | 191 | memset(eah->hw_dst, '\0', ETH_ALEN); |
192 | else | 192 | else |
193 | memcpy(eah->hw_dst, sha, ETH_ALEN); | 193 | ether_addr_copy(eah->hw_dst, sha); |
194 | 194 | ||
195 | eah->pa_dst_zero = 0; | 195 | eah->pa_dst_zero = 0; |
196 | eah->pa_dst_net = them->s_net; | 196 | 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 | eah->pa_len = AARP_PA_ALEN; | 232 | eah->pa_len = AARP_PA_ALEN; |
233 | eah->function = htons(AARP_PROBE); | 233 | eah->function = htons(AARP_PROBE); |
234 | 234 | ||
235 | memcpy(eah->hw_src, dev->dev_addr, ETH_ALEN); | 235 | ether_addr_copy(eah->hw_src, dev->dev_addr); |
236 | 236 | ||
237 | eah->pa_src_zero = 0; | 237 | eah->pa_src_zero = 0; |
238 | eah->pa_src_net = us->s_net; | 238 | eah->pa_src_net = us->s_net; |
@@ -790,7 +790,7 @@ static int aarp_rcv(struct sk_buff *skb, struct net_device *dev, | |||
790 | break; | 790 | break; |
791 | 791 | ||
792 | /* We can fill one in - this is good. */ | 792 | /* We can fill one in - this is good. */ |
793 | memcpy(a->hwaddr, ea->hw_src, ETH_ALEN); | 793 | ether_addr_copy(a->hwaddr, ea->hw_src); |
794 | __aarp_resolved(&unresolved[hash], a, hash); | 794 | __aarp_resolved(&unresolved[hash], a, hash); |
795 | if (!unresolved_count) | 795 | if (!unresolved_count) |
796 | mod_timer(&aarp_timer, | 796 | mod_timer(&aarp_timer, |