Commit dbdaee7a authored by Bob Copeland's avatar Bob Copeland Committed by Johannes Berg
Browse files

{nl,mac}80211: report gate connectivity in station info 



Capture the current state of gate connectivity from the mesh
formation field in mesh config whenever we receive a beacon,
and report that via GET_STATION.  This allows applications
doing mesh peering in userspace to make peering decisions
based on peers' current upstream connectivity.

Signed-off-by: default avatarBob Copeland <bobcopeland@fb.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 4a6ecd35

include/linux/ieee80211.h

+2 −0
Original line number Diff line number Diff line
@@ -812,6 +812,8 @@ enum mesh_config_capab_flags { 
	IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL	= 0x40,

};



#define IEEE80211_MESHCONF_FORM_CONNECTED_TO_GATE 0x1



/**

 * mesh channel switch parameters element's flag indicator

 *

include/net/cfg80211.h

+3 −0
Original line number Diff line number Diff line
@@ -1296,6 +1296,7 @@ struct cfg80211_tid_stats { 
 * @rx_beacon: number of beacons received from this peer

 * @rx_beacon_signal_avg: signal strength average (in dBm) for beacons received

 *	from this peer

 * @connected_to_gate: true if mesh STA has a path to mesh gate

 * @rx_duration: aggregate PPDU duration(usecs) for all the frames from a peer

 * @pertid: per-TID statistics, see &struct cfg80211_tid_stats, using the last

 *	(IEEE80211_NUM_TIDS) index for MSDUs not encapsulated in QoS-MPDUs.
@@ -1350,6 +1351,8 @@ struct station_info { 
	u64 rx_beacon;

	u64 rx_duration;

	u8 rx_beacon_signal_avg;

	u8 connected_to_gate;



	struct cfg80211_tid_stats *pertid;

	s8 ack_signal;

	s8 avg_ack_signal;

include/uapi/linux/nl80211.h

+3 −0
Original line number Diff line number Diff line
@@ -3116,6 +3116,8 @@ enum nl80211_sta_bss_param { 
 *	with an FCS error (u32, from this station). This count may not include

 *	some packets with an FCS error due to TA corruption. Hence this counter

 *	might not be fully accurate.

 * @NL80211_STA_INFO_CONNECTED_TO_GATE: set to true if STA has a path to a

 *	mesh gate

 * @__NL80211_STA_INFO_AFTER_LAST: internal

 * @NL80211_STA_INFO_MAX: highest possible station info attribute

 */
@@ -3158,6 +3160,7 @@ enum nl80211_sta_info { 
	NL80211_STA_INFO_ACK_SIGNAL_AVG,

	NL80211_STA_INFO_RX_MPDUS,

	NL80211_STA_INFO_FCS_ERROR_COUNT,

	NL80211_STA_INFO_CONNECTED_TO_GATE,



	/* keep last */

	__NL80211_STA_INFO_AFTER_LAST,

net/mac80211/mesh_plink.c

+3 −0
Original line number Diff line number Diff line
@@ -590,6 +590,9 @@ void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata, 
	if (!sta)

		goto out;



	sta->mesh->connected_to_gate = elems->mesh_config->meshconf_form &

		IEEE80211_MESHCONF_FORM_CONNECTED_TO_GATE;



	if (mesh_peer_accepts_plinks(elems) &&

	    sta->mesh->plink_state == NL80211_PLINK_LISTEN &&

	    sdata->u.mesh.accepting_plinks &&

net/mac80211/sta_info.c

+3 −1
Original line number Diff line number Diff line
@@ -2264,7 +2264,8 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo, 
				 BIT_ULL(NL80211_STA_INFO_PLINK_STATE) |

				 BIT_ULL(NL80211_STA_INFO_LOCAL_PM) |

				 BIT_ULL(NL80211_STA_INFO_PEER_PM) |

				 BIT_ULL(NL80211_STA_INFO_NONPEER_PM);

				 BIT_ULL(NL80211_STA_INFO_NONPEER_PM) |

				 BIT_ULL(NL80211_STA_INFO_CONNECTED_TO_GATE);



		sinfo->llid = sta->mesh->llid;

		sinfo->plid = sta->mesh->plid;
@@ -2276,6 +2277,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo, 
		sinfo->local_pm = sta->mesh->local_pm;

		sinfo->peer_pm = sta->mesh->peer_pm;

		sinfo->nonpeer_pm = sta->mesh->nonpeer_pm;

		sinfo->connected_to_gate = sta->mesh->connected_to_gate;

#endif

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE