Commit 976bd9ef authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent 763aa27a

net/mac80211/ethtool.c

+1 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static const char ieee80211_gstrings_sta_stats[][ETH_GSTRING_LEN] = { 
	"rx_duplicates", "rx_fragments", "rx_dropped",

	"tx_packets", "tx_bytes",

	"tx_filtered", "tx_retry_failed", "tx_retries",

	"beacon_loss", "sta_state", "txrate", "rxrate", "signal",

	"sta_state", "txrate", "rxrate", "signal",

	"channel", "noise", "ch_time", "ch_time_busy",

	"ch_time_ext_busy", "ch_time_rx", "ch_time_tx"

};
@@ -90,7 +90,6 @@ static void ieee80211_get_stats(struct net_device *dev, 
		data[i++] += sta->tx_filtered_count;	\

		data[i++] += sta->tx_retry_failed;	\

		data[i++] += sta->tx_retry_count;	\

		data[i++] += sta->beacon_loss_count;	\

	} while (0)



	/* For Managed stations, find the single station based on BSSID

net/mac80211/ieee80211_i.h

+3 −0
Original line number Diff line number Diff line
@@ -503,6 +503,9 @@ struct ieee80211_if_managed { 
	 */

	unsigned int count_beacon_signal;



	/* Number of times beacon loss was invoked. */

	unsigned int beacon_loss_count;



	/*

	 * Last Beacon frame signal strength average (ave_beacon_signal / 16)

	 * that triggered a cqm event. 0 indicates that no event has been

net/mac80211/mlme.c

+2 −8
Original line number Diff line number Diff line
@@ -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",

net/mac80211/sta_info.c

+6 −3
Original line number Diff line number Diff line
@@ -1871,8 +1871,12 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) 
			 BIT(NL80211_STA_INFO_STA_FLAGS) |

			 BIT(NL80211_STA_INFO_BSS_PARAM) |

			 BIT(NL80211_STA_INFO_CONNECTED_TIME) |

			 BIT(NL80211_STA_INFO_RX_DROP_MISC) |

			 BIT(NL80211_STA_INFO_BEACON_LOSS);

			 BIT(NL80211_STA_INFO_RX_DROP_MISC);



	if (sdata->vif.type == NL80211_IFTYPE_STATION) {

		sinfo->beacon_loss_count = sdata->u.mgd.beacon_loss_count;

		sinfo->filled |= BIT(NL80211_STA_INFO_BEACON_LOSS);

	}



	sinfo->connected_time = ktime_get_seconds() - sta->last_connected;

	sinfo->inactive_time = jiffies_to_msecs(jiffies - sta->last_rx);
@@ -1914,7 +1918,6 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) 
	}



	sinfo->rx_dropped_misc = sta->rx_dropped;

	sinfo->beacon_loss_count = sta->beacon_loss_count;



	if (sdata->vif.type == NL80211_IFTYPE_STATION &&

	    !(sdata->vif.driver_flags & IEEE80211_VIF_BEACON_FILTER)) {

net/mac80211/sta_info.h

+0 −1
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ struct sta_info { 
	enum ieee80211_sta_rx_bandwidth cur_max_bandwidth;



	unsigned int lost_packets;

	unsigned int beacon_loss_count;



	enum ieee80211_smps_mode known_smps_mode;

	const struct ieee80211_cipher_scheme *cipher_scheme;

CRA Git | Maintained and supported by SUSTech CRA and CCSE