mac80211: move beacon_loss_count into ifmgd

There's little point in keeping (and even sending to userspace)
the beacon_loss_count value per station, since it can only apply
to the AP on a managed-mode connection. Move the value to ifmgd,
advertise it only in managed mode, and remove it from ethtool as
it's available through better interfaces.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 2 insertions, 8 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 6158db06a5b5..ded4b976bb48 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2420,15 +2420,9 @@ static void ieee80211_beacon_connection_loss_work(struct work_struct *work)
                 container_of(work, struct ieee80211_sub_if_data,
                              u.mgd.beacon_connection_loss_work);
         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
-        struct sta_info *sta;
 
-        if (ifmgd->associated) {
-                rcu_read_lock();
-                sta = sta_info_get(sdata, ifmgd->bssid);
-                if (sta)
-                        sta->beacon_loss_count++;
-                rcu_read_unlock();
-        }
+        if (ifmgd->associated)
+                ifmgd->beacon_loss_count++;
 
         if (ifmgd->connection_loss) {
                 sdata_info(sdata, "Connection to AP %pM lost\n",