diff options
| author | Joe Perches <joe@perches.com> | 2014-02-18 21:42:45 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-20 00:37:51 +0400 |
| commit | 2a7c183bc7ae798915c4bc58d3bf413fe466705b (patch) | |
| tree | 216ea76f1cbcfb55ba52819fa4360702bcb381f2 /drivers/net | |
| parent | 4cc5c475797ae9152738d8ea53131576083e4d5b (diff) | |
| download | linux-2a7c183bc7ae798915c4bc58d3bf413fe466705b.tar.xz | |
bonding: More use of ether_addr_copy
It's smaller and faster for some architectures.
Signed-off-by: Joe Perches <joe@perches.com>
Reviewed-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bonding/bond_3ad.c | 4 | ||||
| -rw-r--r-- | drivers/net/bonding/bond_alb.c | 5 | ||||
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index e362ff720e6b..87348411bafe 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -2384,8 +2384,8 @@ int __bond_3ad_get_active_agg_info(struct bonding *bond, ad_info->ports = aggregator->num_of_ports; ad_info->actor_key = aggregator->actor_oper_aggregator_key; ad_info->partner_key = aggregator->partner_oper_aggregator_key; - memcpy(ad_info->partner_system, - aggregator->partner_system.mac_addr_value, ETH_ALEN); + ether_addr_copy(ad_info->partner_system, + aggregator->partner_system.mac_addr_value); return 0; } diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index 538913e62715..97a43a20dae8 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -1449,9 +1449,8 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) if (tx_slave && SLAVE_IS_OK(tx_slave)) { if (tx_slave != rcu_dereference(bond->curr_active_slave)) { - memcpy(eth_data->h_source, - tx_slave->dev->dev_addr, - ETH_ALEN); + ether_addr_copy(eth_data->h_source, + tx_slave->dev->dev_addr); } bond_dev_queue_xmit(bond, skb, tx_slave->dev); diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index afae7cab5cf6..71edf03544aa 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -674,8 +674,8 @@ static void bond_do_fail_over_mac(struct bonding *bond, if (old_active) { ether_addr_copy(tmp_mac, new_active->dev->dev_addr); - memcpy(saddr.sa_data, old_active->dev->dev_addr, - ETH_ALEN); + ether_addr_copy(saddr.sa_data, + old_active->dev->dev_addr); saddr.sa_family = new_active->dev->type; } else { ether_addr_copy(saddr.sa_data, bond->dev->dev_addr); @@ -1139,7 +1139,7 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb) kfree_skb(skb); return RX_HANDLER_CONSUMED; } - memcpy(eth_hdr(skb)->h_dest, bond->dev->dev_addr, ETH_ALEN); + ether_addr_copy(eth_hdr(skb)->h_dest, bond->dev->dev_addr); } return ret; |