diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-20 23:40:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-20 23:40:43 +0200 |
| commit | 580043a27da2bd8201ee321a0d5550c629fcab8d (patch) | |
| tree | 382880dcf5ff869d270ec0c2ef979475bf48cf5e /net | |
| parent | ip_gre: dont increase dev->needed_headroom on a live device (diff) | |
| parent | batman-adv: correctly set the data field in the TT_REPONSE packet (diff) | |
| download | linux-580043a27da2bd8201ee321a0d5550c629fcab8d.tar.xz linux-580043a27da2bd8201ee321a0d5550c629fcab8d.zip | |
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net')
| -rw-r--r-- | net/batman-adv/translation-table.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index fb6931d00cd7..ef1acfd7653c 100644 --- a/net/batman-adv/translation-table.c +++ b/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; } @@ -1668,6 +1671,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); } |