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

batman at open-mesh.org batman at open-mesh.org
Fri Jun 22 00:17:05 CEST 2012


The following commit has been merged in the master branch:
commit 1a5852d81a664e5a6456f82dff6f31b06dc2bede
Author: Al Viro <viro at ZenIV.linux.org.uk>
Date:   Sun Apr 22 07:50:29 2012 +0100

    batman-adv: get rid of pointless cast in memcpy()
    
    memcpy() arguments are void *, precisely to avoid that kind of pointless
    casts.
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index 5c1ac55..89e2b1c 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -510,7 +510,7 @@ static void bla_send_announce(struct bat_priv *bat_priv,
 
 	memcpy(mac, announce_mac, 4);
 	crc = htons(backbone_gw->crc);
-	memcpy(&mac[4], (uint8_t *)&crc, 2);
+	memcpy(&mac[4], &crc, 2);
 
 	bla_send_claim(bat_priv, mac, backbone_gw->vid, CLAIM_TYPE_ANNOUNCE);
 

-- 
LinuxNextTracking


More information about the linux-merge mailing list