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

Commit ebe27c91 authored by Mohammed Shafi Shajakhan's avatar Mohammed Shafi Shajakhan Committed by John W. Linville
Browse files

{mac|nl}80211: Add station connected time 



Add station connected time in debugfs. This will be helpful to get a
measure of stability of the connection and for debugging stress issues

Cc: Senthilkumar Balasubramanian <Senthilkumar.Balasubramanian@Atheros.com>
Signed-off-by: default avatarMohammed Shafi Shajakhan <mshajakhan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f60c49b6

include/linux/nl80211.h

+2 −0
Original line number Diff line number Diff line
@@ -1297,6 +1297,7 @@ enum nl80211_sta_bss_param { 
 *	attribute, like NL80211_STA_INFO_TX_BITRATE.

 * @NL80211_STA_INFO_BSS_PARAM: current station's view of BSS, nested attribute

 *     containing info as possible, see &enum nl80211_sta_bss_param

 * @NL80211_STA_INFO_CONNECTED_TIME: time since the station is last connected

 * @__NL80211_STA_INFO_AFTER_LAST: internal

 * @NL80211_STA_INFO_MAX: highest possible station info attribute

 */
@@ -1317,6 +1318,7 @@ enum nl80211_sta_info { 
	NL80211_STA_INFO_SIGNAL_AVG,

	NL80211_STA_INFO_RX_BITRATE,

	NL80211_STA_INFO_BSS_PARAM,

	NL80211_STA_INFO_CONNECTED_TIME,



	/* keep last */

	__NL80211_STA_INFO_AFTER_LAST,

include/net/cfg80211.h

+4 −0
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ struct station_parameters { 
 * @STATION_INFO_SIGNAL_AVG: @signal_avg filled

 * @STATION_INFO_RX_BITRATE: @rxrate fields are filled

 * @STATION_INFO_BSS_PARAM: @bss_param filled

 * @STATION_INFO_CONNECTED_TIME: @connected_time filled

 */

enum station_info_flags {

	STATION_INFO_INACTIVE_TIME	= 1<<0,
@@ -441,6 +442,7 @@ enum station_info_flags { 
	STATION_INFO_SIGNAL_AVG		= 1<<13,

	STATION_INFO_RX_BITRATE		= 1<<14,

	STATION_INFO_BSS_PARAM          = 1<<15,

	STATION_INFO_CONNECTED_TIME	= 1<<16

};



/**
@@ -511,6 +513,7 @@ struct sta_bss_parameters { 
 * Station information filled by driver for get_station() and dump_station.

 *

 * @filled: bitflag of flags from &enum station_info_flags

 * @connected_time: time(in secs) since a station is last connected

 * @inactive_time: time since last station activity (tx/rx) in milliseconds

 * @rx_bytes: bytes received from this station

 * @tx_bytes: bytes transmitted to this station
@@ -533,6 +536,7 @@ struct sta_bss_parameters { 
 */

struct station_info {

	u32 filled;

	u32 connected_time;

	u32 inactive_time;

	u32 rx_bytes;

	u32 tx_bytes;

net/mac80211/cfg.c

+6 −1
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ static void rate_idx_to_bitrate(struct rate_info *rate, struct sta_info *sta, in 
static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)

{

	struct ieee80211_sub_if_data *sdata = sta->sdata;

	struct timespec uptime;



	sinfo->generation = sdata->local->sta_generation;
@@ -343,7 +344,11 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) 
			STATION_INFO_TX_BITRATE |

			STATION_INFO_RX_BITRATE |

			STATION_INFO_RX_DROP_MISC |

			STATION_INFO_BSS_PARAM;

			STATION_INFO_BSS_PARAM |

			STATION_INFO_CONNECTED_TIME;



	do_posix_clock_monotonic_gettime(&uptime);

	sinfo->connected_time = uptime.tv_sec - sta->last_connected;



	sinfo->inactive_time = jiffies_to_msecs(jiffies - sta->last_rx);

	sinfo->rx_bytes = sta->rx_bytes;

net/mac80211/debugfs_sta.c

+26 −0
Original line number Diff line number Diff line
@@ -92,6 +92,31 @@ static ssize_t sta_inactive_ms_read(struct file *file, char __user *userbuf, 
}

STA_OPS(inactive_ms);





static ssize_t sta_connected_time_read(struct file *file, char __user *userbuf,

					size_t count, loff_t *ppos)

{

	struct sta_info *sta = file->private_data;

	struct timespec uptime;

	struct tm result;

	long connected_time_secs;

	char buf[100];

	int res;

	do_posix_clock_monotonic_gettime(&uptime);

	connected_time_secs = uptime.tv_sec - sta->last_connected;

	time_to_tm(connected_time_secs, 0, &result);

	result.tm_year -= 70;

	result.tm_mday -= 1;

	res = scnprintf(buf, sizeof(buf),

		"years  - %d\nmonths - %d\ndays   - %d\nclock  - %d:%d:%d\n\n",

			result.tm_year, result.tm_mon, result.tm_mday,

			result.tm_hour, result.tm_min, result.tm_sec);

	return simple_read_from_buffer(userbuf, count, ppos, buf, res);

}

STA_OPS(connected_time);







static ssize_t sta_last_seq_ctrl_read(struct file *file, char __user *userbuf,

				      size_t count, loff_t *ppos)

{
@@ -324,6 +349,7 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta) 
	DEBUGFS_ADD(flags);

	DEBUGFS_ADD(num_ps_buf_frames);

	DEBUGFS_ADD(inactive_ms);

	DEBUGFS_ADD(connected_time);

	DEBUGFS_ADD(last_seq_ctrl);

	DEBUGFS_ADD(agg_status);

	DEBUGFS_ADD(dev);

net/mac80211/sta_info.c

+3 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata, 
{

	struct ieee80211_local *local = sdata->local;

	struct sta_info *sta;

	struct timespec uptime;

	int i;



	sta = kzalloc(sizeof(*sta) + local->hw.sta_data_size, gfp);
@@ -245,6 +246,8 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata, 
	sta->sdata = sdata;

	sta->last_rx = jiffies;



	do_posix_clock_monotonic_gettime(&uptime);

	sta->last_connected = uptime.tv_sec;

	ewma_init(&sta->avg_signal, 1024, 8);



	if (sta_prepare_rate_control(local, sta, gfp)) {