netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Einon <mark.einon@gmail.com>
To: gregkh@linuxfoundation.org
Cc: devel@driverdev.osuosl.org, angus@agibson.me,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	joe@perches.com, Mark Einon <mark.einon@gmail.com>,
	davem@davemloft.net
Subject: [PATCH 1/4] staging: et131x: Use ether_addr_copy when copying ethernet addresses
Date: Wed, 24 Sep 2014 09:54:39 +0100	[thread overview]
Message-ID: <1411548882-10639-1-git-send-email-mark.einon@gmail.com> (raw)
In-Reply-To: <1411506437.29268.13.camel@joe-AO725>

Reported-by: Joe Perches <joe@perches.com>
Signed-off-by: Mark Einon <mark.einon@gmail.com>
---
 drivers/staging/et131x/et131x.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 4b2ae49..b976c75 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -3188,15 +3188,13 @@ static void et131x_hwaddr_init(struct et131x_adapter *adapter)
 		 * working with so we need to copy the current
 		 * address into the permanent address
 		 */
-		memcpy(adapter->rom_addr,
-		       adapter->addr, ETH_ALEN);
+		ether_addr_copy(adapter->rom_addr, adapter->addr);
 	} else {
 		/* We do not have an override address, so set the
 		 * current address to the permanent address and add
 		 * it to the device
 		 */
-		memcpy(adapter->addr,
-		       adapter->rom_addr, ETH_ALEN);
+		ether_addr_copy(adapter->addr, adapter->rom_addr);
 	}
 }
 
@@ -4048,7 +4046,7 @@ static void et131x_multicast(struct net_device *netdev)
 	netdev_for_each_mc_addr(ha, netdev) {
 		if (i == NIC_MAX_MCAST_LIST)
 			break;
-		memcpy(adapter->multicast_list[i++], ha->addr, ETH_ALEN);
+		ether_addr_copy(adapter->multicast_list[i++], ha->addr);
 	}
 	adapter->multicast_addr_count = i;
 
@@ -4178,7 +4176,7 @@ static int et131x_change_mtu(struct net_device *netdev, int new_mtu)
 	et131x_init_send(adapter);
 
 	et131x_hwaddr_init(adapter);
-	memcpy(netdev->dev_addr, adapter->addr, ETH_ALEN);
+	ether_addr_copy(netdev->dev_addr, adapter->addr);
 
 	/* Init the device with the new settings */
 	et131x_adapter_setup(adapter);
@@ -4296,7 +4294,7 @@ static int et131x_pci_setup(struct pci_dev *pdev,
 	netif_napi_add(netdev, &adapter->napi, et131x_poll, 64);
 
 	/* Copy address into the net_device struct */
-	memcpy(netdev->dev_addr, adapter->addr, ETH_ALEN);
+	ether_addr_copy(netdev->dev_addr, adapter->addr);
 
 	rc = -ENOMEM;
 
-- 
1.7.10.4

  reply	other threads:[~2014-09-24  8:54 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-22 21:28 [RFC PATCH linux-next] et131x: Promote staging et131x driver to drivers/net Mark Einon
2014-09-22 23:56 ` Angus Gibson
2014-09-23  9:51   ` Mark Einon
2014-09-23  1:57 ` Joe Perches
2014-09-23  9:50   ` Mark Einon
2014-09-23  7:22 ` Tobias Klauser
2014-09-23  9:46   ` Mark Einon
2014-09-23 10:01     ` Tobias Klauser
2014-09-23 11:06       ` Mark Einon
2014-09-23 19:41       ` [PATCH 1/4] staging: et131x: zero allocation of fbr to prevent random address access Mark Einon
2014-09-23 19:41         ` [PATCH 2/4] staging: et131x: don't cast a void* to a struct pointer Mark Einon
2014-09-23 19:41         ` [PATCH 3/4] staging: et131x: Add space after { in pci ID table Mark Einon
2014-09-23 19:41         ` [PATCH 4/4] staging: et131x: Remove unnecessary defines to enable driver PM Mark Einon
2014-09-23 19:02     ` [RFC PATCH linux-next] et131x: Promote staging et131x driver to drivers/net Francois Romieu
2014-09-23 19:17       ` Joe Perches
2014-09-23 20:07         ` Francois Romieu
2014-09-23 20:05 ` [PATCH v2] " Mark Einon
2014-09-23 21:07   ` Joe Perches
2014-09-24  8:54     ` Mark Einon [this message]
2014-09-24  8:54       ` [PATCH 2/4] staging: et131x: Cat some lines less than 80 columns Mark Einon
2014-09-24  8:54       ` [PATCH 3/4] staging: et131x: Remove unnecessary OOM message Mark Einon
2014-09-24  8:54       ` [PATCH 4/4] staging: et131x: Remove unnecessary parentheses Mark Einon
2014-09-24  9:00     ` [PATCH v2] et131x: Promote staging et131x driver to drivers/net Mark Einon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1411548882-10639-1-git-send-email-mark.einon@gmail.com \
    --to=mark.einon@gmail.com \
    --cc=angus@agibson.me \
    --cc=davem@davemloft.net \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).