From 88b532a07737429ae3f7b9c467d1ac55c8649914 Mon Sep 17 00:00:00 2001 From: Marco Porsch Date: Fri, 23 Nov 2012 12:23:18 -0800 Subject: [PATCH] --- yaml --- r: 341981 b: refs/heads/master c: 372039031c62886c8c5b57a7b0111446e9caefa8 h: refs/heads/master i: 341979: 3fe61406a2618402ea697e54261d1c16f743b303 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mesh_sync.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ea9b24e8d6fe..2dec0cc17c17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c04d61500d706b20361eef02e819b9bed8e92c01 +refs/heads/master: 372039031c62886c8c5b57a7b0111446e9caefa8 diff --git a/trunk/net/mac80211/mesh_sync.c b/trunk/net/mac80211/mesh_sync.c index 0f40086cce18..aa8d1e437385 100644 --- a/trunk/net/mac80211/mesh_sync.c +++ b/trunk/net/mac80211/mesh_sync.c @@ -195,11 +195,15 @@ static void mesh_sync_offset_adjust_tbtt(struct ieee80211_sub_if_data *sdata) ifmsh->sync_offset_clockdrift_max); set_bit(MESH_WORK_DRIFT_ADJUST, &ifmsh->wrkq_flags); + + ifmsh->adjusting_tbtt = true; } else { msync_dbg(sdata, "TBTT : max clockdrift=%lld; too small to adjust\n", (long long)ifmsh->sync_offset_clockdrift_max); ifmsh->sync_offset_clockdrift_max = 0; + + ifmsh->adjusting_tbtt = false; } spin_unlock_bh(&ifmsh->sync_offset_lock); }