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

Commit b206b4ef authored by Bruno Randolf's avatar Bruno Randolf Committed by John W. Linville
Browse files

nl80211/mac80211: Add retry and failed transmission count to station info 



This information is already available in mac80211, we just need to export it
via cfg80211 and nl80211.

Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 09be251e

include/linux/nl80211.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -1137,6 +1137,8 @@ enum nl80211_rate_info { 
 * @NL80211_STA_INFO_RX_PACKETS: total received packet (u32, from this station)

 * @NL80211_STA_INFO_RX_PACKETS: total received packet (u32, from this station)

 * @NL80211_STA_INFO_TX_PACKETS: total transmitted packets (u32, to this

 * @NL80211_STA_INFO_TX_PACKETS: total transmitted packets (u32, to this

 *	station)

 *	station)

 * @NL80211_STA_INFO_TX_RETRIES: total retries (u32, to this station)

 * @NL80211_STA_INFO_TX_FAILED: total failed packets (u32, to this station)

 */

 */

enum nl80211_sta_info {

enum nl80211_sta_info {

	__NL80211_STA_INFO_INVALID,

	__NL80211_STA_INFO_INVALID,
@@ -1150,6 +1152,8 @@ enum nl80211_sta_info { 
	NL80211_STA_INFO_TX_BITRATE,

	NL80211_STA_INFO_TX_BITRATE,

	NL80211_STA_INFO_RX_PACKETS,

	NL80211_STA_INFO_RX_PACKETS,

	NL80211_STA_INFO_TX_PACKETS,

	NL80211_STA_INFO_TX_PACKETS,

	NL80211_STA_INFO_TX_RETRIES,

	NL80211_STA_INFO_TX_FAILED,





	/* keep last */

	/* keep last */

	__NL80211_STA_INFO_AFTER_LAST,

	__NL80211_STA_INFO_AFTER_LAST,

include/net/cfg80211.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -401,6 +401,8 @@ struct station_parameters { 
 *  (tx_bitrate, tx_bitrate_flags and tx_bitrate_mcs)

 *  (tx_bitrate, tx_bitrate_flags and tx_bitrate_mcs)

 * @STATION_INFO_RX_PACKETS: @rx_packets filled

 * @STATION_INFO_RX_PACKETS: @rx_packets filled

 * @STATION_INFO_TX_PACKETS: @tx_packets filled

 * @STATION_INFO_TX_PACKETS: @tx_packets filled

 * @STATION_INFO_TX_RETRIES: @tx_retries filled

 * @STATION_INFO_TX_FAILED: @tx_failed filled

 */

 */

enum station_info_flags {

enum station_info_flags {

	STATION_INFO_INACTIVE_TIME	= 1<<0,

	STATION_INFO_INACTIVE_TIME	= 1<<0,
@@ -413,6 +415,8 @@ enum station_info_flags { 
	STATION_INFO_TX_BITRATE		= 1<<7,

	STATION_INFO_TX_BITRATE		= 1<<7,

	STATION_INFO_RX_PACKETS		= 1<<8,

	STATION_INFO_RX_PACKETS		= 1<<8,

	STATION_INFO_TX_PACKETS		= 1<<9,

	STATION_INFO_TX_PACKETS		= 1<<9,

	STATION_INFO_TX_RETRIES		= 1<<10,

	STATION_INFO_TX_FAILED		= 1<<11,

};

};





/**

/**
@@ -462,6 +466,8 @@ struct rate_info { 
 * @txrate: current unicast bitrate to this station

 * @txrate: current unicast bitrate to this station

 * @rx_packets: packets received from this station

 * @rx_packets: packets received from this station

 * @tx_packets: packets transmitted to this station

 * @tx_packets: packets transmitted to this station

 * @tx_retries: cumulative retry counts

 * @tx_failed: number of failed transmissions (retries exceeded, no ACK)

 * @generation: generation number for nl80211 dumps.

 * @generation: generation number for nl80211 dumps.

 *	This number should increase every time the list of stations

 *	This number should increase every time the list of stations

 *	changes, i.e. when a station is added or removed, so that

 *	changes, i.e. when a station is added or removed, so that
@@ -479,6 +485,8 @@ struct station_info { 
	struct rate_info txrate;

	struct rate_info txrate;

	u32 rx_packets;

	u32 rx_packets;

	u32 tx_packets;

	u32 tx_packets;

	u32 tx_retries;

	u32 tx_failed;





	int generation;

	int generation;

};

};

net/mac80211/cfg.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -327,6 +327,8 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) 
			STATION_INFO_TX_BYTES |

			STATION_INFO_TX_BYTES |

			STATION_INFO_RX_PACKETS |

			STATION_INFO_RX_PACKETS |

			STATION_INFO_TX_PACKETS |

			STATION_INFO_TX_PACKETS |

			STATION_INFO_TX_RETRIES |

			STATION_INFO_TX_FAILED |

			STATION_INFO_TX_BITRATE;

			STATION_INFO_TX_BITRATE;





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

	sinfo->inactive_time = jiffies_to_msecs(jiffies - sta->last_rx);
@@ -334,6 +336,8 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) 
	sinfo->tx_bytes = sta->tx_bytes;

	sinfo->tx_bytes = sta->tx_bytes;

	sinfo->rx_packets = sta->rx_packets;

	sinfo->rx_packets = sta->rx_packets;

	sinfo->tx_packets = sta->tx_packets;

	sinfo->tx_packets = sta->tx_packets;

	sinfo->tx_retries = sta->tx_retry_count;

	sinfo->tx_failed = sta->tx_retry_failed;





	if ((sta->local->hw.flags & IEEE80211_HW_SIGNAL_DBM) ||

	if ((sta->local->hw.flags & IEEE80211_HW_SIGNAL_DBM) ||

	    (sta->local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)) {

	    (sta->local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)) {

net/wireless/nl80211.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -1890,6 +1890,12 @@ static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq, 
	if (sinfo->filled & STATION_INFO_TX_PACKETS)

	if (sinfo->filled & STATION_INFO_TX_PACKETS)

		NLA_PUT_U32(msg, NL80211_STA_INFO_TX_PACKETS,

		NLA_PUT_U32(msg, NL80211_STA_INFO_TX_PACKETS,

			    sinfo->tx_packets);

			    sinfo->tx_packets);

	if (sinfo->filled & STATION_INFO_TX_RETRIES)

		NLA_PUT_U32(msg, NL80211_STA_INFO_TX_RETRIES,

			    sinfo->tx_retries);

	if (sinfo->filled & STATION_INFO_TX_FAILED)

		NLA_PUT_U32(msg, NL80211_STA_INFO_TX_FAILED,

			    sinfo->tx_failed);

	nla_nest_end(msg, sinfoattr);

	nla_nest_end(msg, sinfoattr);





	return genlmsg_end(msg, hdr);

	return genlmsg_end(msg, hdr);