The following commit has been merged in the next branch: commit 815cfb5c7b2d561195806bd9945351cff1285b10 Author: Al Viro viro@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@zeniv.linux.org.uk

diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index d864e1c..2a5f631 100644 --- a/bridge_loop_avoidance.c +++ b/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);