From patchwork Wed Sep 24 08:54:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Einon X-Patchwork-Id: 392835 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AEB83140095 for ; Wed, 24 Sep 2014 19:06:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751681AbaIXIzy (ORCPT ); Wed, 24 Sep 2014 04:55:54 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:52056 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751568AbaIXIzw (ORCPT ); Wed, 24 Sep 2014 04:55:52 -0400 Received: by mail-wi0-f173.google.com with SMTP id r20so6452407wiv.0 for ; Wed, 24 Sep 2014 01:55:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8/gciAHM+4rZmvClmzV6wuarxlWwqSC+HEzb+m9FXgE=; b=T5VekqtZ6eAPF4xi96fWHMvswbKML/31SjJvmUexTEYeWPBARgDtFbZu6ra1vjyptY BgRixKq0ZM9oGLowQeqJUKHi39XI3oGC01bKgV+2z58xjX0/sCH+sUTGpMAqxa9A1Rq2 BEYczWJZ/FlvhV10AM5CvnUSsEp53hfrEHBJRvC3AZeDBLTbT+CtxQLzwUBS0kG5MzNV RwdXO+Vy8vJLlw6feSSaVsFRdbljSa07stvmHj4/wt/rfhgwjnDiUhNc36aZ+wUYJzqT xs2kKq+DGD3f4OU/+MkFh8QxUVKj9ysjBoyGeaAZXUuoFK2Kv50FaRIsiE/IOpEl7Od7 U+dg== X-Received: by 10.180.92.225 with SMTP id cp1mr10237792wib.5.1411548951043; Wed, 24 Sep 2014 01:55:51 -0700 (PDT) Received: from leicester.auvation.com ([81.134.199.89]) by mx.google.com with ESMTPSA id q2sm4997439wiy.23.2014.09.24.01.55.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Sep 2014 01:55:50 -0700 (PDT) From: Mark Einon To: gregkh@linuxfoundation.org Cc: joe@perches.com, davem@davemloft.net, angus@agibson.me, tklauser@distanz.ch, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devel@driverdev.osuosl.org, Mark Einon Subject: [PATCH 1/4] staging: et131x: Use ether_addr_copy when copying ethernet addresses Date: Wed, 24 Sep 2014 09:54:39 +0100 Message-Id: <1411548882-10639-1-git-send-email-mark.einon@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1411506437.29268.13.camel@joe-AO725> References: <1411506437.29268.13.camel@joe-AO725> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Reported-by: Joe Perches Signed-off-by: Mark Einon --- 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;