Commit 37203903 authored Nov 23, 2012 by Marco Porsch Committed by Johannes Berg Nov 30, 2012

mac80211: fix for mesh sync to indicate TBTT adjustment

Currently the mesh sync code checks, whether peers indicate TBTT adjustment,
but it never sets the corresponding flag itself.

By setting ifmsh->tbtt_adjusting to true, it will set the corresponding field
in the mesh configuration IE of own beacons.
This indication will be set in the current beacon. The TBTT adjustment will be
performed afterwards, affecting the next beacon. Thus, the first beacon with
stable TBTT will not indicate adjustment anymore and peers will continue
tracking the new offset.

Signed-off-by: Marco Porsch <marco.porsch@etit.tu-chemnitz.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent c04d6150

net/mac80211/mesh_sync.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message