Commit 445cd452 authored by Masashi Honma's avatar Masashi Honma Committed by Johannes Berg
Browse files

mac80211: Use appropriate name for functions and messages 



These functions drifts TSF timers, not TBTT.

Signed-off-by: default avatarMasashi Honma <masashi.honma@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 76f43b4c

net/mac80211/ieee80211_i.h

+2 −2
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ struct ieee80211_mesh_sync_ops { 
			     struct ieee80211_rx_status *rx_status);



	/* 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);

	/* add other framework functions here */

};

net/mac80211/mesh.c

+1 −1
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ void ieee80211_mesh_work(struct ieee80211_sub_if_data *sdata) 
		ieee80211_mesh_rootpath(sdata);



	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))

		mesh_bss_info_changed(sdata);

net/mac80211/mesh.h

+1 −1
Original line number Diff line number Diff line
@@ -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_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata);

void mesh_sync_adjust_tsf(struct ieee80211_sub_if_data *sdata);

void ieee80211s_stop(void);

#else

static inline bool mesh_path_sel_is_hwmp(struct ieee80211_sub_if_data *sdata)

net/mac80211/mesh_sync.c

+8 −8
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "mesh.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.

 */

#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;

}



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_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);

	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);

		tsfdelta = -ifmsh->sync_offset_clockdrift_max;

		ifmsh->sync_offset_clockdrift_max = 0;

	} 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,

			  (unsigned long long) beacon_int_fraction);

		tsfdelta = -beacon_int_fraction;
@@ -167,7 +167,7 @@ static void mesh_sync_offset_rx_bcn_presp(struct ieee80211_sub_if_data *sdata, 
	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 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

		 */

		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);

		set_bit(MESH_WORK_DRIFT_ADJUST, &ifmsh->wrkq_flags);

	} else {

		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);

		ifmsh->sync_offset_clockdrift_max = 0;

	}
@@ -201,7 +201,7 @@ static const struct sync_method sync_methods[] = { 
		.method = IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET,

		.ops = {

			.rx_bcn_presp = &mesh_sync_offset_rx_bcn_presp,

			.adjust_tbtt = &mesh_sync_offset_adjust_tbtt,

			.adjust_tsf = &mesh_sync_offset_adjust_tsf,

		}

	},

};

net/mac80211/tx.c

+1 −1
Original line number Diff line number Diff line
@@ -4196,7 +4196,7 @@ __ieee80211_beacon_get(struct ieee80211_hw *hw, 
		}



		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 +

				    beacon->head_len +