The following commit has been merged in the master branch: commit abae9479ca9fa5616ae0debfbda54bf5424001df Author: Fengguang Wu fengguang.wu@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@intel.com Signed-off-by: Martin Hundebøll martin@hundeboll.net Signed-off-by: Marek Lindner mareklindner@neomailbox.ch Signed-off-by: Antonio Quartulli antonio@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