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>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 34f09ef90bb3..a92985a6ea21 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -1616,10 +1616,10 @@ static int lbs_cfg_get_station(struct wiphy *wiphy, struct net_device *dev,
 
         lbs_deb_enter(LBS_DEB_CFG80211);
 
-        sinfo->filled |= STATION_INFO_TX_BYTES |
-                         STATION_INFO_TX_PACKETS |
-                         STATION_INFO_RX_BYTES |
-                         STATION_INFO_RX_PACKETS;
+        sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES) |
+                         BIT(NL80211_STA_INFO_TX_PACKETS) |
+                         BIT(NL80211_STA_INFO_RX_BYTES) |
+                         BIT(NL80211_STA_INFO_RX_PACKETS);
         sinfo->tx_bytes = priv->dev->stats.tx_bytes;
         sinfo->tx_packets = priv->dev->stats.tx_packets;
         sinfo->rx_bytes = priv->dev->stats.rx_bytes;
@@ -1629,14 +1629,14 @@ static int lbs_cfg_get_station(struct wiphy *wiphy, struct net_device *dev,
         ret = lbs_get_rssi(priv, &signal, &noise);
         if (ret == 0) {
                 sinfo->signal = signal;
-                sinfo->filled |= STATION_INFO_SIGNAL;
+                sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
         }
 
         /* Convert priv->cur_rate from hw_value to NL80211 value */
         for (i = 0; i < ARRAY_SIZE(lbs_rates); i++) {
                 if (priv->cur_rate == lbs_rates[i].hw_value) {
                         sinfo->txrate.legacy = lbs_rates[i].bitrate;
-                        sinfo->filled |= STATION_INFO_TX_BITRATE;
+                        sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
                         break;
                 }
         }