lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge

Browse Source
This commit is contained in:
David S. Miller
2011-10-20 17:40:43 -04:00
parent 113ab386c7 9d8523931f
commit 580043a27d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/batman-adv/translation-table.c
View File

@@ -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_response = (struct tt_query_packet *)skb_put(skb,
tt_query_size + tt_len); tt_query_size + tt_len);
tt_response->ttvn = ttvn; tt_response->ttvn = ttvn;
tt_response->tt_data = htons(tt_tot);
tt_change = (struct tt_change *)(skb->data + tt_query_size); tt_change = (struct tt_change *)(skb->data + tt_query_size);
tt_count = 0; 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(); rcu_read_unlock();
/* store in the message the number of entries we have successfully
* copied */
tt_response->tt_data = htons(tt_count);
out: out:
return skb; return skb;
} }
@@ -1668,6 +1671,8 @@ static void tt_local_reset_flags(struct bat_priv *bat_priv, uint16_t flags)
rcu_read_lock(); rcu_read_lock();
hlist_for_each_entry_rcu(tt_local_entry, node, hlist_for_each_entry_rcu(tt_local_entry, node,
head, hash_entry) { head, hash_entry) {
if (!(tt_local_entry->flags & flags))
continue;
tt_local_entry->flags &= ~flags; tt_local_entry->flags &= ~flags;
atomic_inc(&bat_priv->num_local_tt); atomic_inc(&bat_priv->num_local_tt);
} }