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

Commit 9ea08b12 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

pktgen: Use ether_addr_copy 



Use ether_addr_copy instead of memcpy(a, b, ETH_ALEN) to
save some cycles on arm and powerpc.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c62326ab

net/core/pktgen.c

+4 −4
Original line number Diff line number Diff line
@@ -1440,7 +1440,7 @@ static ssize_t pktgen_if_write(struct file *file, 
		if (!mac_pton(valstr, pkt_dev->dst_mac))

			return -EINVAL;

		/* Set up Dest MAC */

		memcpy(&pkt_dev->hh[0], pkt_dev->dst_mac, ETH_ALEN);

		ether_addr_copy(&pkt_dev->hh[0], pkt_dev->dst_mac);



		sprintf(pg_result, "OK: dstmac %pM", pkt_dev->dst_mac);

		return count;
@@ -1457,7 +1457,7 @@ static ssize_t pktgen_if_write(struct file *file, 
		if (!mac_pton(valstr, pkt_dev->src_mac))

			return -EINVAL;

		/* Set up Src MAC */

		memcpy(&pkt_dev->hh[6], pkt_dev->src_mac, ETH_ALEN);

		ether_addr_copy(&pkt_dev->hh[6], pkt_dev->src_mac);



		sprintf(pg_result, "OK: srcmac %pM", pkt_dev->src_mac);

		return count;
@@ -2060,10 +2060,10 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev) 
	/* Default to the interface's mac if not explicitly set. */



	if (is_zero_ether_addr(pkt_dev->src_mac))

		memcpy(&(pkt_dev->hh[6]), pkt_dev->odev->dev_addr, ETH_ALEN);

		ether_addr_copy(&(pkt_dev->hh[6]), pkt_dev->odev->dev_addr);



	/* Set up Dest MAC */

	memcpy(&(pkt_dev->hh[0]), pkt_dev->dst_mac, ETH_ALEN);

	ether_addr_copy(&(pkt_dev->hh[0]), pkt_dev->dst_mac);



	if (pkt_dev->flags & F_IPV6) {

		int i, set = 0, err = 1;