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

Commit 8fdd0153 authored by Antonio Quartulli's avatar Antonio Quartulli
Browse files

batman-adv: prefer ether_addr_copy to memcpy 



On some architectures ether_addr_copy() is slightly faster
than memcpy() therefore use the former when possible.

Signed-off-by: default avatarAntonio Quartulli <antonio@meshcoding.com>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
parent e88b617d

net/batman-adv/bat_iv_ogm.c

+5 −5
Original line number Diff line number Diff line
@@ -347,10 +347,10 @@ static void batadv_iv_ogm_iface_update_mac(struct batadv_hard_iface *hard_iface) 
	unsigned char *ogm_buff = hard_iface->bat_iv.ogm_buff;



	batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff;

	memcpy(batadv_ogm_packet->orig,

	       hard_iface->net_dev->dev_addr, ETH_ALEN);

	memcpy(batadv_ogm_packet->prev_sender,

	       hard_iface->net_dev->dev_addr, ETH_ALEN);

	ether_addr_copy(batadv_ogm_packet->orig,

			hard_iface->net_dev->dev_addr);

	ether_addr_copy(batadv_ogm_packet->prev_sender,

			hard_iface->net_dev->dev_addr);

}



static void
@@ -830,7 +830,7 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node, 
	tvlv_len = ntohs(batadv_ogm_packet->tvlv_len);



	batadv_ogm_packet->ttl--;

	memcpy(batadv_ogm_packet->prev_sender, ethhdr->h_source, ETH_ALEN);

	ether_addr_copy(batadv_ogm_packet->prev_sender, ethhdr->h_source);



	/* apply hop penalty */

	batadv_ogm_packet->tq = batadv_hop_penalty(batadv_ogm_packet->tq,

net/batman-adv/bridge_loop_avoidance.c

+15 −15
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ batadv_backbone_hash_find(struct batadv_priv *bat_priv, 
	if (!hash)

		return NULL;



	memcpy(search_entry.orig, addr, ETH_ALEN);

	ether_addr_copy(search_entry.orig, addr);

	search_entry.vid = vid;



	index = batadv_choose_backbone_gw(&search_entry, hash->size);
@@ -305,7 +305,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
		/* normal claim frame

		 * set Ethernet SRC to the clients mac

		 */

		memcpy(ethhdr->h_source, mac, ETH_ALEN);

		ether_addr_copy(ethhdr->h_source, mac);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

			   "bla_send_claim(): CLAIM %pM on vid %d\n", mac,

			   BATADV_PRINT_VID(vid));
@@ -314,7 +314,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
		/* unclaim frame

		 * set HW SRC to the clients mac

		 */

		memcpy(hw_src, mac, ETH_ALEN);

		ether_addr_copy(hw_src, mac);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

			   "bla_send_claim(): UNCLAIM %pM on vid %d\n", mac,

			   BATADV_PRINT_VID(vid));
@@ -323,7 +323,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
		/* announcement frame

		 * set HW SRC to the special mac containg the crc

		 */

		memcpy(hw_src, mac, ETH_ALEN);

		ether_addr_copy(hw_src, mac);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

			   "bla_send_claim(): ANNOUNCE of %pM on vid %d\n",

			   ethhdr->h_source, BATADV_PRINT_VID(vid));
@@ -333,8 +333,8 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
		 * set HW SRC and header destination to the receiving backbone

		 * gws mac

		 */

		memcpy(hw_src, mac, ETH_ALEN);

		memcpy(ethhdr->h_dest, mac, ETH_ALEN);

		ether_addr_copy(hw_src, mac);

		ether_addr_copy(ethhdr->h_dest, mac);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

			   "bla_send_claim(): REQUEST of %pM to %pM on vid %d\n",

			   ethhdr->h_source, ethhdr->h_dest,
@@ -395,7 +395,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig, 
	entry->bat_priv = bat_priv;

	atomic_set(&entry->request_sent, 0);

	atomic_set(&entry->wait_periods, 0);

	memcpy(entry->orig, orig, ETH_ALEN);

	ether_addr_copy(entry->orig, orig);



	/* one for the hash, one for returning */

	atomic_set(&entry->refcount, 2);
@@ -563,7 +563,7 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, 
	struct batadv_bla_claim search_claim;

	int hash_added;



	memcpy(search_claim.addr, mac, ETH_ALEN);

	ether_addr_copy(search_claim.addr, mac);

	search_claim.vid = vid;

	claim = batadv_claim_hash_find(bat_priv, &search_claim);
@@ -573,7 +573,7 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, 
		if (!claim)

			return;



		memcpy(claim->addr, mac, ETH_ALEN);

		ether_addr_copy(claim->addr, mac);

		claim->vid = vid;

		claim->lasttime = jiffies;

		claim->backbone_gw = backbone_gw;
@@ -624,7 +624,7 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, 
{

	struct batadv_bla_claim search_claim, *claim;



	memcpy(search_claim.addr, mac, ETH_ALEN);

	ether_addr_copy(search_claim.addr, mac);

	search_claim.vid = vid;

	claim = batadv_claim_hash_find(bat_priv, &search_claim);

	if (!claim)
@@ -1103,8 +1103,8 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, 
						oldif->net_dev->dev_addr))

				continue;



			memcpy(backbone_gw->orig,

			       primary_if->net_dev->dev_addr, ETH_ALEN);

			ether_addr_copy(backbone_gw->orig,

					primary_if->net_dev->dev_addr);

			/* send an announce frame so others will ask for our

			 * claims and update their tables.

			 */
@@ -1310,7 +1310,7 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, 
	entry = &bat_priv->bla.bcast_duplist[curr];

	entry->crc = crc;

	entry->entrytime = jiffies;

	memcpy(entry->orig, bcast_packet->orig, ETH_ALEN);

	ether_addr_copy(entry->orig, bcast_packet->orig);

	bat_priv->bla.bcast_duplist_curr = curr;



out:
@@ -1458,7 +1458,7 @@ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, 
		if (is_multicast_ether_addr(ethhdr->h_dest) && is_bcast)

			goto handled;



	memcpy(search_claim.addr, ethhdr->h_source, ETH_ALEN);

	ether_addr_copy(search_claim.addr, ethhdr->h_source);

	search_claim.vid = vid;

	claim = batadv_claim_hash_find(bat_priv, &search_claim);
@@ -1557,7 +1557,7 @@ int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, 
		if (is_multicast_ether_addr(ethhdr->h_dest))

			goto handled;



	memcpy(search_claim.addr, ethhdr->h_source, ETH_ALEN);

	ether_addr_copy(search_claim.addr, ethhdr->h_source);

	search_claim.vid = vid;



	claim = batadv_claim_hash_find(bat_priv, &search_claim);

net/batman-adv/distributed-arp-table.c

+2 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, 
	/* if this entry is already known, just update it */

	if (dat_entry) {

		if (!batadv_compare_eth(dat_entry->mac_addr, mac_addr))

			memcpy(dat_entry->mac_addr, mac_addr, ETH_ALEN);

			ether_addr_copy(dat_entry->mac_addr, mac_addr);

		dat_entry->last_update = jiffies;

		batadv_dbg(BATADV_DBG_DAT, bat_priv,

			   "Entry updated: %pI4 %pM (vid: %d)\n",
@@ -292,7 +292,7 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, 


	dat_entry->ip = ip;

	dat_entry->vid = vid;

	memcpy(dat_entry->mac_addr, mac_addr, ETH_ALEN);

	ether_addr_copy(dat_entry->mac_addr, mac_addr);

	dat_entry->last_update = jiffies;

	atomic_set(&dat_entry->refcount, 2);

net/batman-adv/fragmentation.c

+2 −2
Original line number Diff line number Diff line
@@ -449,8 +449,8 @@ bool batadv_frag_send_packet(struct sk_buff *skb, 
	frag_header.reserved = 0;

	frag_header.no = 0;

	frag_header.total_size = htons(skb->len);

	memcpy(frag_header.orig, primary_if->net_dev->dev_addr, ETH_ALEN);

	memcpy(frag_header.dest, orig_node->orig, ETH_ALEN);

	ether_addr_copy(frag_header.orig, primary_if->net_dev->dev_addr);

	ether_addr_copy(frag_header.dest, orig_node->orig);



	/* Eat and send fragments from the tail of skb */

	while (skb->len > max_fragment_size) {

net/batman-adv/gateway_client.c

+1 −1
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len, 
		if (*p != ETH_ALEN)

			return BATADV_DHCP_NO;



		memcpy(chaddr, skb->data + chaddr_offset, ETH_ALEN);

		ether_addr_copy(chaddr, skb->data + chaddr_offset);

	}



	return ret;