redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

mac80211: Use appropriate name for functions and messages 

These functions drifts TSF timers, not TBTT.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
zero-colors
Masashi Honma 2016-12-08 10:15:51 +09:00 committed by Johannes Berg
parent 76f43b4c0a
commit 445cd452fe
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/ieee80211_i.h
View File

@ -625,8 +625,8 @@ struct ieee80211_mesh_sync_ops {
struct ieee80211_rx_status *rx_status); struct ieee80211_rx_status *rx_status);
/* should be called with beacon_data under RCU read lock */ /* should be called with beacon_data under RCU read lock */
void (*adjust_tbtt)(struct ieee80211_sub_if_data *sdata, void (*adjust_tsf)(struct ieee80211_sub_if_data *sdata,
struct beacon_data *beacon); struct beacon_data *beacon);
/* add other framework functions here */ /* add other framework functions here */
}; };

2
net/mac80211/mesh.c
View File

@ -1346,7 +1346,7 @@ void ieee80211_mesh_work(struct ieee80211_sub_if_data *sdata)
ieee80211_mesh_rootpath(sdata); ieee80211_mesh_rootpath(sdata);
if (test_and_clear_bit(MESH_WORK_DRIFT_ADJUST, &ifmsh->wrkq_flags)) if (test_and_clear_bit(MESH_WORK_DRIFT_ADJUST, &ifmsh->wrkq_flags))
mesh_sync_adjust_tbtt(sdata); mesh_sync_adjust_tsf(sdata);
if (test_and_clear_bit(MESH_WORK_MBSS_CHANGED, &ifmsh->wrkq_flags)) if (test_and_clear_bit(MESH_WORK_MBSS_CHANGED, &ifmsh->wrkq_flags))
mesh_bss_info_changed(sdata); mesh_bss_info_changed(sdata);

2
net/mac80211/mesh.h
View File

@ -341,7 +341,7 @@ static inline bool mesh_path_sel_is_hwmp(struct ieee80211_sub_if_data *sdata)
} }
void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata); void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata);
void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata); void mesh_sync_adjust_tsf(struct ieee80211_sub_if_data *sdata);
void ieee80211s_stop(void); void ieee80211s_stop(void);
#else #else
static inline bool mesh_path_sel_is_hwmp(struct ieee80211_sub_if_data *sdata) static inline bool mesh_path_sel_is_hwmp(struct ieee80211_sub_if_data *sdata)

16
net/mac80211/mesh_sync.c
View File

@ -12,7 +12,7 @@
#include "mesh.h" #include "mesh.h"
#include "driver-ops.h" #include "driver-ops.h"
/* This is not in the standard. It represents a tolerable tbtt drift below /* This is not in the standard. It represents a tolerable tsf drift below
* which we do no TSF adjustment. * which we do no TSF adjustment.
*/ */
#define TOFFSET_MINIMUM_ADJUSTMENT 10 #define TOFFSET_MINIMUM_ADJUSTMENT 10
@ -46,7 +46,7 @@ static bool mesh_peer_tbtt_adjusting(struct ieee802_11_elems *ie)
IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING) != 0; IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING) != 0;
} }
void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata) void mesh_sync_adjust_tsf(struct ieee80211_sub_if_data *sdata)
{ {
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
@ -57,12 +57,12 @@ void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata)
spin_lock_bh(&ifmsh->sync_offset_lock); spin_lock_bh(&ifmsh->sync_offset_lock);
if (ifmsh->sync_offset_clockdrift_max < beacon_int_fraction) { if (ifmsh->sync_offset_clockdrift_max < beacon_int_fraction) {
msync_dbg(sdata, "TBTT : max clockdrift=%lld; adjusting\n", msync_dbg(sdata, "TSF : max clockdrift=%lld; adjusting\n",
(long long) ifmsh->sync_offset_clockdrift_max); (long long) ifmsh->sync_offset_clockdrift_max);
tsfdelta = -ifmsh->sync_offset_clockdrift_max; tsfdelta = -ifmsh->sync_offset_clockdrift_max;
ifmsh->sync_offset_clockdrift_max = 0; ifmsh->sync_offset_clockdrift_max = 0;
} else { } else {
msync_dbg(sdata, "TBTT : max clockdrift=%lld; adjusting by %llu\n", msync_dbg(sdata, "TSF : max clockdrift=%lld; adjusting by %llu\n",
(long long) ifmsh->sync_offset_clockdrift_max, (long long) ifmsh->sync_offset_clockdrift_max,
(unsigned long long) beacon_int_fraction); (unsigned long long) beacon_int_fraction);
tsfdelta = -beacon_int_fraction; tsfdelta = -beacon_int_fraction;
@ -167,7 +167,7 @@ no_sync:
rcu_read_unlock(); rcu_read_unlock();
} }
static void mesh_sync_offset_adjust_tbtt(struct ieee80211_sub_if_data *sdata, static void mesh_sync_offset_adjust_tsf(struct ieee80211_sub_if_data *sdata,
struct beacon_data *beacon) struct beacon_data *beacon)
{ {
struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
@ -184,12 +184,12 @@ static void mesh_sync_offset_adjust_tbtt(struct ieee80211_sub_if_data *sdata,
* the tsf adjustment to the mesh tasklet * the tsf adjustment to the mesh tasklet
*/ */
msync_dbg(sdata, msync_dbg(sdata,
"TBTT : kicking off TBTT adjustment with clockdrift_max=%lld\n", "TSF : kicking off TSF adjustment with clockdrift_max=%lld\n",
ifmsh->sync_offset_clockdrift_max); ifmsh->sync_offset_clockdrift_max);
set_bit(MESH_WORK_DRIFT_ADJUST, &ifmsh->wrkq_flags); set_bit(MESH_WORK_DRIFT_ADJUST, &ifmsh->wrkq_flags);
} else { } else {
msync_dbg(sdata, msync_dbg(sdata,
"TBTT : max clockdrift=%lld; too small to adjust\n", "TSF : max clockdrift=%lld; too small to adjust\n",
(long long)ifmsh->sync_offset_clockdrift_max); (long long)ifmsh->sync_offset_clockdrift_max);
ifmsh->sync_offset_clockdrift_max = 0; ifmsh->sync_offset_clockdrift_max = 0;
} }
@ -201,7 +201,7 @@ static const struct sync_method sync_methods[] = {
.method = IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET, .method = IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET,
.ops = { .ops = {
.rx_bcn_presp = &mesh_sync_offset_rx_bcn_presp, .rx_bcn_presp = &mesh_sync_offset_rx_bcn_presp,
.adjust_tbtt = &mesh_sync_offset_adjust_tbtt, .adjust_tsf = &mesh_sync_offset_adjust_tsf,
} }
}, },
}; };

2
net/mac80211/tx.c
View File

@ -4196,7 +4196,7 @@ __ieee80211_beacon_get(struct ieee80211_hw *hw,
} }
if (ifmsh->sync_ops) if (ifmsh->sync_ops)
ifmsh->sync_ops->adjust_tbtt(sdata, beacon); ifmsh->sync_ops->adjust_tsf(sdata, beacon);
skb = dev_alloc_skb(local->tx_headroom + skb = dev_alloc_skb(local->tx_headroom +
beacon->head_len + beacon->head_len +