Merge tag 'pwm/for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[sfrench/cifs-2.6.git] / net / batman-adv / fragmentation.c

diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
index 88df9b1d552de529b20cb699c303ec76034dee12..bcc4bea632fa69ead6567e016f2f265840f7968b 100644 (file)
--- a/net/batman-adv/fragmentation.c
+++ b/net/batman-adv/fragmentation.c
@@ -449,8 +449,8 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
        frag_header.reserved = 0;
        frag_header.no = 0;
        frag_header.total_size = htons(skb->len);
-       memcpy(frag_header.orig, primary_if->net_dev->dev_addr, ETH_ALEN);
-       memcpy(frag_header.dest, orig_node->orig, ETH_ALEN);
+       ether_addr_copy(frag_header.orig, primary_if->net_dev->dev_addr);
+       ether_addr_copy(frag_header.dest, orig_node->orig);
 
        /* Eat and send fragments from the tail of skb */
        while (skb->len > max_fragment_size) {