diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2014-11-17 14:08:11 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-01-08 15:28:10 +0100 |
| commit | 319090bf6c75e3ad42a8c74973be5e78ae4f948f (patch) | |
| tree | 499fe25951bd986948c2b0e0552dfeca0784ae3a /net/mac80211/ethtool.c | |
| parent | mac80211: allow drivers to provide most station statistics (diff) | |
| download | linux-dev-319090bf6c75e3ad42a8c74973be5e78ae4f948f.tar.xz linux-dev-319090bf6c75e3ad42a8c74973be5e78ae4f948f.zip | |
cfg80211: remove enum station_info_flags
This is really just duplicating the list of information that's
already available in the nl80211 attribute, so remove the list.
Two small changes are needed:
* remove STATION_INFO_ASSOC_REQ_IES complete, but the length
(assoc_req_ies_len) can be used instead
* add NL80211_STA_INFO_RX_DROP_MISC which exists internally
but not in nl80211 yet
This gets rid of the duplicate maintenance of the two lists.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ethtool.c')
| -rw-r--r-- | net/mac80211/ethtool.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/ethtool.c b/net/mac80211/ethtool.c index eea742710c0a..52bcea6ad9e8 100644 --- a/net/mac80211/ethtool.c +++ b/net/mac80211/ethtool.c @@ -117,16 +117,16 @@ static void ieee80211_get_stats(struct net_device *dev, data[i++] = sta->sta_state; - if (sinfo.filled & STATION_INFO_TX_BITRATE) + if (sinfo.filled & BIT(NL80211_STA_INFO_TX_BITRATE)) data[i] = 100000 * cfg80211_calculate_bitrate(&sinfo.txrate); i++; - if (sinfo.filled & STATION_INFO_RX_BITRATE) + if (sinfo.filled & BIT(NL80211_STA_INFO_RX_BITRATE)) data[i] = 100000 * cfg80211_calculate_bitrate(&sinfo.rxrate); i++; - if (sinfo.filled & STATION_INFO_SIGNAL_AVG) + if (sinfo.filled & BIT(NL80211_STA_INFO_SIGNAL_AVG)) data[i] = (u8)sinfo.signal_avg; i++; } else { |