Commit 2a7c183b authored by Joe Perches's avatar Joe Perches Committed by David S. Miller

bonding: More use of ether_addr_copy

It's smaller and faster for some architectures.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Reviewed-by: default avatarDing Tianhong <dingtianhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4cc5c475
...@@ -2384,8 +2384,8 @@ int __bond_3ad_get_active_agg_info(struct bonding *bond, ...@@ -2384,8 +2384,8 @@ int __bond_3ad_get_active_agg_info(struct bonding *bond,
ad_info->ports = aggregator->num_of_ports; ad_info->ports = aggregator->num_of_ports;
ad_info->actor_key = aggregator->actor_oper_aggregator_key; ad_info->actor_key = aggregator->actor_oper_aggregator_key;
ad_info->partner_key = aggregator->partner_oper_aggregator_key; ad_info->partner_key = aggregator->partner_oper_aggregator_key;
memcpy(ad_info->partner_system, ether_addr_copy(ad_info->partner_system,
aggregator->partner_system.mac_addr_value, ETH_ALEN); aggregator->partner_system.mac_addr_value);
return 0; return 0;
} }
......
...@@ -1449,9 +1449,8 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) ...@@ -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 && SLAVE_IS_OK(tx_slave)) {
if (tx_slave != rcu_dereference(bond->curr_active_slave)) { if (tx_slave != rcu_dereference(bond->curr_active_slave)) {
memcpy(eth_data->h_source, ether_addr_copy(eth_data->h_source,
tx_slave->dev->dev_addr, tx_slave->dev->dev_addr);
ETH_ALEN);
} }
bond_dev_queue_xmit(bond, skb, tx_slave->dev); bond_dev_queue_xmit(bond, skb, tx_slave->dev);
......
...@@ -674,8 +674,8 @@ static void bond_do_fail_over_mac(struct bonding *bond, ...@@ -674,8 +674,8 @@ static void bond_do_fail_over_mac(struct bonding *bond,
if (old_active) { if (old_active) {
ether_addr_copy(tmp_mac, new_active->dev->dev_addr); ether_addr_copy(tmp_mac, new_active->dev->dev_addr);
memcpy(saddr.sa_data, old_active->dev->dev_addr, ether_addr_copy(saddr.sa_data,
ETH_ALEN); old_active->dev->dev_addr);
saddr.sa_family = new_active->dev->type; saddr.sa_family = new_active->dev->type;
} else { } else {
ether_addr_copy(saddr.sa_data, bond->dev->dev_addr); 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) ...@@ -1139,7 +1139,7 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
kfree_skb(skb); kfree_skb(skb);
return RX_HANDLER_CONSUMED; 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; return ret;
......
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