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: Bruno Randolf <br1@einfach.org>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index e451f176e662fd751f74fcf1fe1826630c3f12d5..c08709fe36fc93f842cb4a6e0149741e0f6efaa6 100644 (file)
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -1137,6 +1137,8 @@ enum nl80211_rate_info {
  * @NL80211_STA_INFO_RX_PACKETS: total received packet (u32, from this station)
  * @NL80211_STA_INFO_TX_PACKETS: total transmitted packets (u32, to this
  *     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 {
        __NL80211_STA_INFO_INVALID,
@@ -1150,6 +1152,8 @@ enum nl80211_sta_info {
        NL80211_STA_INFO_TX_BITRATE,
        NL80211_STA_INFO_RX_PACKETS,
        NL80211_STA_INFO_TX_PACKETS,
+       NL80211_STA_INFO_TX_RETRIES,
+       NL80211_STA_INFO_TX_FAILED,
 
        /* keep last */
        __NL80211_STA_INFO_AFTER_LAST,

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 0f77515266b8b6d4344b16171d5a2fa2a37351a1..e76daaa7dc25cc0f3303f451caa45038c14bf4ca 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -401,6 +401,8 @@ struct station_parameters {
  *  (tx_bitrate, tx_bitrate_flags and tx_bitrate_mcs)
  * @STATION_INFO_RX_PACKETS: @rx_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 {
        STATION_INFO_INACTIVE_TIME      = 1<<0,
@@ -413,6 +415,8 @@ enum station_info_flags {
        STATION_INFO_TX_BITRATE         = 1<<7,
        STATION_INFO_RX_PACKETS         = 1<<8,
        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
  * @rx_packets: packets received from 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.
  *     This number should increase every time the list of stations
  *     changes, i.e. when a station is added or removed, so that
@@ -479,6 +485,8 @@ struct station_info {
        struct rate_info txrate;
        u32 rx_packets;
        u32 tx_packets;
+       u32 tx_retries;
+       u32 tx_failed;
 
        int generation;
 };

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 8b0e874a3d65f72ce25e7881152f883de2e8409b..2e5a3fb38efe117aa139f441dfd0b6de69368b1f 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -327,6 +327,8 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
                        STATION_INFO_TX_BYTES |
                        STATION_INFO_RX_PACKETS |
                        STATION_INFO_TX_PACKETS |
+                       STATION_INFO_TX_RETRIES |
+                       STATION_INFO_TX_FAILED |
                        STATION_INFO_TX_BITRATE;
 
        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->rx_packets = sta->rx_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) ||
            (sta->local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)) {

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 9942f0b061ff78555d2cd0f0e57705e67637f233..524f5540283819b65c0b6bf675118f16b7b48d6f 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1890,6 +1890,12 @@ static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq,
        if (sinfo->filled & STATION_INFO_TX_PACKETS)
                NLA_PUT_U32(msg, NL80211_STA_INFO_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);
 
        return genlmsg_end(msg, hdr);