From: Javier Cardona Date: Fri, 20 Apr 2012 16:52:56 +0000 (-0700) Subject: mac80211: fixup for mesh TSF adjustment latency in Toffset setpoint X-Git-Tag: next-20120430~53^2~46 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6ac95b57657d1bf5776f29a1697c123f62d5a58a;p=karo-tx-linux.git mac80211: fixup for mesh TSF adjustment latency in Toffset setpoint The original patch defined the correction margin but did not apply it. Signed-off-by: Shinichi Hotori Signed-off-by: Yu Niiro Signed-off-by: Javier Cardona Signed-off-by: John W. Linville --- diff --git a/net/mac80211/mesh_sync.c b/net/mac80211/mesh_sync.c index ff60d6bcc631..38d30e8ce6dc 100644 --- a/net/mac80211/mesh_sync.c +++ b/net/mac80211/mesh_sync.c @@ -195,7 +195,7 @@ static void mesh_sync_offset_rx_bcn_presp(struct ieee80211_sub_if_data *sdata, spin_unlock_bh(&ifmsh->sync_offset_lock); } else { - sta->t_offset_setpoint = sta->t_offset; + sta->t_offset_setpoint = sta->t_offset - TOFFSET_SET_MARGIN; set_sta_flag(sta, WLAN_STA_TOFFSET_KNOWN); msync_dbg("STA %pM : offset was invalid, " " sta->t_offset=%lld",