[linux-next] LinuxNextTracking branch, master, updated. next-20140325

batman at open-mesh.org batman at open-mesh.org
Wed Mar 26 00:27:59 CET 2014

The following commit has been merged in the master branch:
commit abae9479ca9fa5616ae0debfbda54bf5424001df
Author: Fengguang Wu <fengguang.wu at intel.com>
Date:   Mon Jan 6 17:09:46 2014 +0100

    batman-adv: fix coccinelle warnings
    net/batman-adv/network-coding.c:1535:1-7: Replace memcpy with struct assignment
    Generated by: coccinelle/misc/memcpy-assign.cocci
    Signed-off-by: Fengguang Wu <fengguang.wu at intel.com>
    Signed-off-by: Martin Hundebøll <martin at hundeboll.net>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>

diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index f1b604d..801ece6 100644
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -1636,7 +1636,7 @@ batadv_nc_skb_decode_packet(struct batadv_priv *bat_priv, struct sk_buff *skb,
 	/* Reconstruct original mac header */
 	ethhdr = eth_hdr(skb);
-	memcpy(ethhdr, &ethhdr_tmp, sizeof(*ethhdr));
+	*ethhdr = ethhdr_tmp;
 	/* Select the correct unicast header information based on the location
 	 * of our mac address in the coded_packet header


More information about the linux-merge mailing list