diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-26 15:54:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-26 15:54:45 -0400 |
| commit | a85c9bb895aed633615078f69f4a4bce9e39be5f (patch) | |
| tree | 0eafc0be614fc70a1c853ee2249e3152d8d15718 /net/mac80211/mesh_sync.c | |
| parent | de248a75c35e0208294cf304b112916254b69184 (diff) | |
| parent | d9b8ae6bd8c3304569a25079fcdbebaa28a48ee4 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'net/mac80211/mesh_sync.c')
| -rw-r--r-- | net/mac80211/mesh_sync.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh_sync.c b/net/mac80211/mesh_sync.c index ff60d6bcc63..38d30e8ce6d 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", |