From b5c03754b180b3e9e6dbc2a2af628fe15a2a9207 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sat, 14 May 2011 23:14:49 +0200 Subject: [PATCH] --- yaml --- r: 255302 b: refs/heads/master c: 38e3c5f0dae7a3bbb32c3b2bb28c3f2557d40fe9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/batman-adv/originator.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 24cc91001fca..8206f9596a69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16f14b45c48f4f1be5857103ee3054114604d98c +refs/heads/master: 38e3c5f0dae7a3bbb32c3b2bb28c3f2557d40fe9 diff --git a/trunk/net/batman-adv/originator.c b/trunk/net/batman-adv/originator.c index 40a30bbcd147..ae54f77f2c1b 100644 --- a/trunk/net/batman-adv/originator.c +++ b/trunk/net/batman-adv/originator.c @@ -559,7 +559,7 @@ static int orig_node_del_if(struct orig_node *orig_node, memcpy(data_ptr, orig_node->bcast_own, del_if_num * chunk_size); /* copy second part */ - memcpy(data_ptr + del_if_num * chunk_size, + memcpy((char *)data_ptr + del_if_num * chunk_size, orig_node->bcast_own + ((del_if_num + 1) * chunk_size), (max_if_num - del_if_num) * chunk_size); @@ -579,7 +579,7 @@ static int orig_node_del_if(struct orig_node *orig_node, memcpy(data_ptr, orig_node->bcast_own_sum, del_if_num * sizeof(uint8_t)); - memcpy(data_ptr + del_if_num * sizeof(uint8_t), + memcpy((char *)data_ptr + del_if_num * sizeof(uint8_t), orig_node->bcast_own_sum + ((del_if_num + 1) * sizeof(uint8_t)), (max_if_num - del_if_num) * sizeof(uint8_t));