From 4be5a0bafbc8b0e9d8ceedd5479d0097fa9c2f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20L=C3=BCssing?= Date: Tue, 19 Oct 2010 11:59:11 +0200 Subject: [PATCH] --- yaml --- r: 220379 b: refs/heads/master c: 5dfa2ba9e658f099c11eab251da348429f6a9d7d h: refs/heads/master i: 220377: 04e17fcb80bd7959c5f489a4f410f2536f6e2f43 220375: b01ec84b57f5da0f019bd405f6ef0acc5d40ae2a v: v3 --- [refs] | 2 +- trunk/drivers/staging/batman-adv/originator.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6a7a9539cbc8..a7862eb71b93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b37bc2c711b2a76ef3daa9437bbf9c58411afbd +refs/heads/master: 5dfa2ba9e658f099c11eab251da348429f6a9d7d diff --git a/trunk/drivers/staging/batman-adv/originator.c b/trunk/drivers/staging/batman-adv/originator.c index c530df12e03e..865211ddd8d2 100644 --- a/trunk/drivers/staging/batman-adv/originator.c +++ b/trunk/drivers/staging/batman-adv/originator.c @@ -456,7 +456,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, + memcpy(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); @@ -476,7 +476,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, + memcpy(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));