summaryrefslogtreecommitdiff
path: root/net/batman-adv/send.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-07-08 08:44:57 -0700
committerDavid S. Miller <davem@davemloft.net>2011-07-08 08:44:57 -0700
commit3f9aed7c7d517dbc717a97649d0a5a9dc80bf4f2 (patch)
treebed215245dc32aea477c76f7124e6af13ba362ac /net/batman-adv/send.c
parent31817df025e24559a01d33ddd68bd11b21bf9d7b (diff)
parenta7f9becb7d27008af0f72f8449c110276b0df37d (diff)
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/batman-adv/send.c')
-rw-r--r--net/batman-adv/send.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index 4b8e11bc14f..58d14472068 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -309,10 +309,8 @@ void schedule_own_packet(struct hard_iface *hard_iface)
if (hard_iface == primary_if) {
/* if at least one change happened */
if (atomic_read(&bat_priv->tt_local_changes) > 0) {
+ tt_commit_changes(bat_priv);
prepare_packet_buffer(bat_priv, hard_iface);
- /* Increment the TTVN only once per OGM interval */
- atomic_inc(&bat_priv->ttvn);
- bat_priv->tt_poss_change = false;
}
/* if the changes have been sent enough times */