Staging:et131x: change memcpy() ether_addr_copy()

Staging:et131x: change memcpy() ether_addr_copy()

[paulmcquad]

>From 63f3c8948d5264ab22695502b201ff50edb9028d Mon Sep 17 00:00:00 2001
From: Paul McQuade <paulmcquad@gmail.com>
Date: Fri, 28 Mar 2014 22:16:22 +0000
Subject: [PATCH] Staging:et131x: change memcpy()  ether_addr_copy()

replace memcpy() with ether_addr_copy()
make checkpatch.pl clean

Signed-off-by: Paul McQuade <paulmcquad@gmail.com>
---
 drivers/staging/et131x/et131x.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index e516bb6..a35d3c8 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -3523,7 +3523,7 @@ static int et131x_pci_init(struct et131x_adapter *adapter,
             goto err_out;
         }
     }
-    memcpy(adapter->addr, adapter->rom_addr, ETH_ALEN);
+    ether_addr_copy(adapter->addr, adapter->rom_addr, ETH_ALEN);
 out:
     return rc;
 err_out:
@@ -3770,7 +3770,7 @@ static struct et131x_adapter *et131x_adapter_init(struct net_device *netdev,
     adapter->registry_jumbo_packet = 1514;    /* 1514-9216 */
 
     /* Set the MAC address to a default */
-    memcpy(adapter->addr, default_mac, ETH_ALEN);
+    ether_addr_copy(adapter->addr, default_mac, ETH_ALEN);
 
     return adapter;
 }
@@ -4337,7 +4337,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, ETH_ALEN);
     }
     adapter->multicast_addr_count = i;
 
@@ -4473,7 +4473,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, ETH_ALEN);
 
     /* Init the device with the new settings */
     et131x_adapter_setup(adapter);
@@ -4644,7 +4644,7 @@ static int et131x_pci_setup(struct pci_dev *pdev,
     INIT_WORK(&adapter->task, et131x_isr_handler);
 
     /* Copy address into the net_device struct */
-    memcpy(netdev->dev_addr, adapter->addr, ETH_ALEN);
+    ether_addr_copy(netdev->dev_addr, adapter->addr, ETH_ALEN);
 
     /* Init variable for counting how long we do not have link status */
     adapter->boot_coma = 0;
-- 
1.8.3.2

Re: Staging:et131x: change memcpy() ether_addr_copy()

[Joe Perches]

On Fri, 2014-03-28 at 22:27 +0000, paulmcquad wrote:
> replace memcpy() with ether_addr_copy()
> make checkpatch.pl clean

broken.

You at least need to change this definition:
drivers/staging/et131x/et131x.c:        static const u8 default_mac[] = { 0x00, 0x05, 0x3d, 0x00, 0x02, 0x00 };
and add __aligned(2) to it to make sure
that the address is appropriately aligned.

> diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
[]
> @@ -3770,7 +3770,7 @@ static struct et131x_adapter *et131x_adapter_init(struct net_device *netdev,
[]
>      /* Set the MAC address to a default */
> -    memcpy(adapter->addr, default_mac, ETH_ALEN);
> +    ether_addr_copy(adapter->addr, default_mac, ETH_ALEN);
[]
> @@ -4337,7 +4337,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, ETH_ALEN);

bad indentation too

Re: Staging:et131x: change memcpy() ether_addr_copy()

[Dan Carpenter]

On Fri, Mar 28, 2014 at 10:27:22PM +0000, paulmcquad wrote:
> >From 63f3c8948d5264ab22695502b201ff50edb9028d Mon Sep 17 00:00:00 2001
> From: Paul McQuade <paulmcquad@gmail.com>
> Date: Fri, 28 Mar 2014 22:16:22 +0000
> Subject: [PATCH] Staging:et131x: change memcpy()  ether_addr_copy()

Don't include this header block.

> 
> replace memcpy() with ether_addr_copy()
> make checkpatch.pl clean

Patch doesn't apply to linux-next.

> @@ -4337,7 +4337,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, ETH_ALEN);

There is an indenting error here.

regards,
dan carpenter

Re: Staging:et131x: change memcpy() ether_addr_copy()

[Jonas Gorski]

On Mon, Mar 31, 2014 at 10:56 AM, Dan Carpenter
<dan.carpenter@oracle.com> wrote:
> On Fri, Mar 28, 2014 at 10:27:22PM +0000, paulmcquad wrote:
>> >From 63f3c8948d5264ab22695502b201ff50edb9028d Mon Sep 17 00:00:00 2001
>> From: Paul McQuade <paulmcquad@gmail.com>
>> Date: Fri, 28 Mar 2014 22:16:22 +0000
>> Subject: [PATCH] Staging:et131x: change memcpy()  ether_addr_copy()
>
> Don't include this header block.
>
>>
>> replace memcpy() with ether_addr_copy()
>> make checkpatch.pl clean
>
> Patch doesn't apply to linux-next.
>
>> @@ -4337,7 +4337,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, ETH_ALEN);
>
> There is an indenting error here.

Also ether_addr_copy does not have a third argument, so it would not
even compile.


Regards
Jonas