mac80211: Add more ethtools stats: survey, rates, etc

The signal and noise are forced to be positive since ethtool
deals in unsigned 64-bit values and this number should be human
readable.  This gives easy access to some of the data formerly
exposed in the deprecated /proc/net/wireless file.

Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index a38b26730652cfd1d733294b4d3ef445240a1c8b..39b1fffb24f4161aec9db8fbed8f7fd2c3b6684e 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -455,7 +455,9 @@ static const char ieee80211_gstrings_sta_stats[][ETH_GSTRING_LEN] = {
        "rx_duplicates", "rx_fragments", "rx_dropped",
        "tx_packets", "tx_bytes", "tx_fragments",
        "tx_filtered", "tx_retry_failed", "tx_retries",
-       "beacon_loss"
+       "beacon_loss", "sta_state", "txrate", "rxrate", "signal",
+       "channel", "noise", "ch_time", "ch_time_busy",
+       "ch_time_ext_busy", "ch_time_rx", "ch_time_tx"
 };
 #define STA_STATS_LEN  ARRAY_SIZE(ieee80211_gstrings_sta_stats)
 
@@ -484,7 +486,10 @@ static void ieee80211_get_et_stats(struct wiphy *wiphy,
        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
        struct sta_info *sta;
        struct ieee80211_local *local = sdata->local;
-       int i;
+       struct station_info sinfo;
+       struct survey_info survey;
+       int i, q;
+#define STA_STATS_SURVEY_LEN 7
 
        memset(data, 0, sizeof(u64) * STA_STATS_LEN);
 
@@ -516,11 +521,30 @@ static void ieee80211_get_et_stats(struct wiphy *wiphy,
 
        if (sdata->vif.type == NL80211_IFTYPE_STATION) {
                sta = sta_info_get_bss(sdata, sdata->u.mgd.bssid);
-               if (sta && !WARN_ON(sta->sdata->dev != dev)) {
-                       i = 0;
-                       ADD_STA_STATS(sta);
-                       BUG_ON(i != STA_STATS_LEN);
-               }
+
+               if (!(sta && !WARN_ON(sta->sdata->dev != dev)))
+                       goto do_survey;
+
+               i = 0;
+               ADD_STA_STATS(sta);
+
+               data[i++] = sta->sta_state;
+
+               sinfo.filled = 0;
+               sta_set_sinfo(sta, &sinfo);
+
+               if (sinfo.filled | STATION_INFO_TX_BITRATE)
+                       data[i] = 100000 *
+                               cfg80211_calculate_bitrate(&sinfo.txrate);
+               i++;
+               if (sinfo.filled | STATION_INFO_RX_BITRATE)
+                       data[i] = 100000 *
+                               cfg80211_calculate_bitrate(&sinfo.rxrate);
+               i++;
+
+               if (sinfo.filled | STATION_INFO_SIGNAL_AVG)
+                       data[i] = (u8)sinfo.signal_avg;
+               i++;
        } else {
                list_for_each_entry_rcu(sta, &local->sta_list, list) {
                        /* Make sure this station belongs to the proper dev */
@@ -529,12 +553,61 @@ static void ieee80211_get_et_stats(struct wiphy *wiphy,
 
                        i = 0;
                        ADD_STA_STATS(sta);
-                       BUG_ON(i != STA_STATS_LEN);
                }
        }
 
+do_survey:
+       i = STA_STATS_LEN - STA_STATS_SURVEY_LEN;
+       /* Get survey stats for current channel */
+       q = 0;
+       while (true) {
+               survey.filled = 0;
+               if (drv_get_survey(local, q, &survey) != 0) {
+                       survey.filled = 0;
+                       break;
+               }
+
+               if (survey.channel &&
+                   (local->oper_channel->center_freq ==
+                    survey.channel->center_freq))
+                       break;
+               q++;
+       }
+
+       if (survey.filled)
+               data[i++] = survey.channel->center_freq;
+       else
+               data[i++] = 0;
+       if (survey.filled & SURVEY_INFO_NOISE_DBM)
+               data[i++] = (u8)survey.noise;
+       else
+               data[i++] = -1LL;
+       if (survey.filled & SURVEY_INFO_CHANNEL_TIME)
+               data[i++] = survey.channel_time;
+       else
+               data[i++] = -1LL;
+       if (survey.filled & SURVEY_INFO_CHANNEL_TIME_BUSY)
+               data[i++] = survey.channel_time_busy;
+       else
+               data[i++] = -1LL;
+       if (survey.filled & SURVEY_INFO_CHANNEL_TIME_EXT_BUSY)
+               data[i++] = survey.channel_time_ext_busy;
+       else
+               data[i++] = -1LL;
+       if (survey.filled & SURVEY_INFO_CHANNEL_TIME_RX)
+               data[i++] = survey.channel_time_rx;
+       else
+               data[i++] = -1LL;
+       if (survey.filled & SURVEY_INFO_CHANNEL_TIME_TX)
+               data[i++] = survey.channel_time_tx;
+       else
+               data[i++] = -1LL;
+
        rcu_read_unlock();
 
+       if (WARN_ON(i != STA_STATS_LEN))
+               return;
+
        drv_get_et_stats(sdata, stats, &(data[STA_STATS_LEN]));
 }