From 4fa20efbcdfc56244519b11710cb5fc60dbe9b49 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Mon, 17 Oct 2011 14:25:13 +0200 Subject: [PATCH] --- yaml --- r: 266929 b: refs/heads/master c: 9d8523931f7f5eb8900077f0da0fbe6b8ad0010b h: refs/heads/master i: 266927: ecd63213e39f63e30028cc7cb58e590efa9885dd v: v3 --- [refs] | 2 +- trunk/net/batman-adv/translation-table.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9c2fce3eab77..65603067215f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31901264511cf20c5ed33b8649a3ca9ce28df60b +refs/heads/master: 9d8523931f7f5eb8900077f0da0fbe6b8ad0010b diff --git a/trunk/net/batman-adv/translation-table.c b/trunk/net/batman-adv/translation-table.c index f599db9dbec1..ef1acfd7653c 100644 --- a/trunk/net/batman-adv/translation-table.c +++ b/trunk/net/batman-adv/translation-table.c @@ -999,7 +999,6 @@ static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn, tt_response = (struct tt_query_packet *)skb_put(skb, tt_query_size + tt_len); tt_response->ttvn = ttvn; - tt_response->tt_data = htons(tt_tot); tt_change = (struct tt_change *)(skb->data + tt_query_size); tt_count = 0; @@ -1025,6 +1024,10 @@ static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn, } rcu_read_unlock(); + /* store in the message the number of entries we have successfully + * copied */ + tt_response->tt_data = htons(tt_count); + out: return skb; }