Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/bonding/bond_3ad.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/net/bonding/bond_alb.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

drivers/net/bonding/bond_main.c

+3 −3
Original line number Diff line number Diff line
@@ -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;