Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...

[linux-2.6-microblaze.git] / net / caif / caif_usb.c

diff --git a/net/caif/caif_usb.c b/net/caif/caif_usb.c
index 75ed04b..ba02db0 100644 (file)
--- a/net/caif/caif_usb.c
+++ b/net/caif/caif_usb.c
@@ -14,6 +14,7 @@
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb/usbnet.h>
+#include <linux/etherdevice.h>
 #include <net/netns/generic.h>
 #include <net/caif/caif_dev.h>
 #include <net/caif/caif_layer.h>
@@ -105,8 +106,8 @@ static struct cflayer *cfusbl_create(int phyid, u8 ethaddr[ETH_ALEN],
         *      5-11    source address
         *      12-13   protocol type
         */
-       memcpy(&this->tx_eth_hdr[ETH_ALEN], braddr, ETH_ALEN);
-       memcpy(&this->tx_eth_hdr[ETH_ALEN], ethaddr, ETH_ALEN);
+       ether_addr_copy(&this->tx_eth_hdr[ETH_ALEN], braddr);
+       ether_addr_copy(&this->tx_eth_hdr[ETH_ALEN], ethaddr);
        this->tx_eth_hdr[12] = cpu_to_be16(ETH_P_802_EX1) & 0xff;
        this->tx_eth_hdr[13] = (cpu_to_be16(ETH_P_802_EX1) >> 8) & 0xff;
        pr_debug("caif ethernet TX-header dst:%pM src:%pM type:%02x%02x\n",