Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12ce8ba3 authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville
Browse files

mac80211: Modify tsf via debugfs in mesh interfaces 



Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Reviewed-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2f40b940

drivers/net/wireless/mac80211_hwsim.c

+18 −0
Original line number Diff line number Diff line
@@ -379,6 +379,22 @@ static __le64 __mac80211_hwsim_get_tsf(struct mac80211_hwsim_data *data) 
	return cpu_to_le64(now + data->tsf_offset);

}



static u64 mac80211_hwsim_get_tsf(struct ieee80211_hw *hw,

		struct ieee80211_vif *vif)

{

	struct mac80211_hwsim_data *data = hw->priv;

	return le64_to_cpu(__mac80211_hwsim_get_tsf(data));

}



static void mac80211_hwsim_set_tsf(struct ieee80211_hw *hw,

		struct ieee80211_vif *vif, u64 tsf)

{

	struct mac80211_hwsim_data *data = hw->priv;

	struct timeval tv = ktime_to_timeval(ktime_get_real());

	u64 now = tv.tv_sec * USEC_PER_SEC + tv.tv_usec;

	data->tsf_offset = tsf - now;

}



static void mac80211_hwsim_monitor_rx(struct ieee80211_hw *hw,

				      struct sk_buff *tx_skb)

{
@@ -1224,6 +1240,8 @@ static struct ieee80211_ops mac80211_hwsim_ops = 
	.sw_scan_start = mac80211_hwsim_sw_scan,

	.sw_scan_complete = mac80211_hwsim_sw_scan_complete,

	.flush = mac80211_hwsim_flush,

	.get_tsf = mac80211_hwsim_get_tsf,

	.set_tsf = mac80211_hwsim_set_tsf,

};

net/mac80211/debugfs_netdev.c

+6 −1
Original line number Diff line number Diff line
@@ -538,11 +538,15 @@ static void add_monitor_files(struct ieee80211_sub_if_data *sdata) 


#ifdef CONFIG_MAC80211_MESH



static void add_mesh_files(struct ieee80211_sub_if_data *sdata)

{

	DEBUGFS_ADD_MODE(tsf, 0600);

}



static void add_mesh_stats(struct ieee80211_sub_if_data *sdata)

{

	struct dentry *dir = debugfs_create_dir("mesh_stats",

						sdata->debugfs.dir);



#define MESHSTATS_ADD(name)\

	debugfs_create_file(#name, 0400, dir, sdata, &name##_ops);
@@ -595,6 +599,7 @@ static void add_files(struct ieee80211_sub_if_data *sdata) 
	switch (sdata->vif.type) {

	case NL80211_IFTYPE_MESH_POINT:

#ifdef CONFIG_MAC80211_MESH

		add_mesh_files(sdata);

		add_mesh_stats(sdata);

		add_mesh_config(sdata);

#endif