xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

Browse Source
This commit is contained in:
David S. Miller
2011-10-24 18:18:09 -04:00
parent 78d81d15b7 f42af6c486
commit 1805b2f048
130 changed files with 850 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}