staging: vt6656: Use ether_addr_copy() on vnt_private members.

This patch fixes checkpatch.pl warning:
WARNING: Prefer ether_addr_copy() over memcpy() if the Ethernet
addresses are __aligned(2)

current_net_addr and permanent_net_addr members of vnt_private alignment
is changed to at last 16 bits so that ether_addr_copy can be safely used
on them.

buf->data is of type ieee80211_cts which is already properly aligned.

Signed-off-by: Krzysztof Adamski <k@japko.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 5a7ca527106ecedfd7f1e3fba6785e2c18f7ffa4..4dcc67d5a84d4f043bd715290525c8b097aa823b 100644 (file)
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -307,8 +307,8 @@ struct vnt_private {
 
        struct vnt_cmd_card_init init_command;
        struct vnt_rsp_card_init init_response;
-       u8 current_net_addr[ETH_ALEN];
-       u8 permanent_net_addr[ETH_ALEN];
+       u8 current_net_addr[ETH_ALEN] __aligned(2);
+       u8 permanent_net_addr[ETH_ALEN] __aligned(2);
 
        u8 exist_sw_net_addr;
 

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index b95d5b1efcc72f15477ad870c45db42b8ebd91c3..71adc1f61838654c0abb10bd377057de19a18a43 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -34,6 +34,7 @@
  */
 #undef __NO_VERSION__
 
+#include <linux/etherdevice.h>
 #include <linux/file.h>
 #include "device.h"
 #include "card.h"
@@ -319,7 +320,7 @@ static int vnt_init_registers(struct vnt_private *priv)
 
        /* get permanent network address */
        memcpy(priv->permanent_net_addr, init_rsp->net_addr, 6);
-       memcpy(priv->current_net_addr, priv->permanent_net_addr, ETH_ALEN);
+       ether_addr_copy(priv->current_net_addr, priv->permanent_net_addr);
 
        /* if exist SW network address, use it */
        dev_dbg(&priv->usb->dev, "Network address = %pM\n",

diff --cc drivers/staging/vt6656/rxtx.c
Simple merge