1 files changed, 6 insertions, 1 deletions

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index cc53f78e448c..873fb3d8e56f 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -1049,7 +1049,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;
@@ -1075,6 +1074,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;
 }
@@ -1722,6 +1725,8 @@ static void tt_local_reset_flags(struct bat_priv *bat_priv, uint16_t flags)
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(tt_local_entry, node,
                                          head, hash_entry) {
+                        if (!(tt_local_entry->flags & flags))
+                                continue;
                         tt_local_entry->flags &= ~flags;
                         atomic_inc(&bat_priv->num_local_tt);
                 }