mac80211: refactor mesh peer rate handling (f743ff49) · Commits · e / devices / android_kernel_xiaomi_nabu

net/mac80211/mesh.c

+9 −10

Original line number	Original line	Diff line number	Diff line
	@@ -64,18 +64,18 @@ static void ieee80211_mesh_housekeeping_timer(unsigned long data)
	/**		/**
	* mesh_matches_local - check if the config of a mesh point matches ours		* mesh_matches_local - check if the config of a mesh point matches ours
	*		*
	* @ie: information elements of a management frame from the mesh peer
	* @sdata: local mesh subif		* @sdata: local mesh subif
	* @basic_rates: BSSBasicRateSet of the peer candidate		* @ie: information elements of a management frame from the mesh peer
	*		*
	* This function checks if the mesh configuration of a mesh point matches the		* This function checks if the mesh configuration of a mesh point matches the
	* local mesh configuration, i.e. if both nodes belong to the same mesh network.		* local mesh configuration, i.e. if both nodes belong to the same mesh network.
	*/		*/
	bool mesh_matches_local(struct ieee802_11_elems *ie,		bool mesh_matches_local(struct ieee80211_sub_if_data *sdata,
	struct ieee80211_sub_if_data *sdata, u32 basic_rates)		struct ieee802_11_elems *ie)
	{		{
	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;		struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
	struct ieee80211_local *local = sdata->local;		struct ieee80211_local *local = sdata->local;
			u32 basic_rates = 0;

	/*		/*
	* As support for each feature is added, check for matching		* As support for each feature is added, check for matching
	@@ -96,6 +96,9 @@ bool mesh_matches_local(struct ieee802_11_elems *ie,
	(ifmsh->mesh_auth_id == ie->mesh_config->meshconf_auth)))		(ifmsh->mesh_auth_id == ie->mesh_config->meshconf_auth)))
	goto mismatch;		goto mismatch;

			ieee80211_sta_get_rates(local, ie, local->oper_channel->band,
			&basic_rates);

	if (sdata->vif.bss_conf.basic_rates != basic_rates)		if (sdata->vif.bss_conf.basic_rates != basic_rates)
	goto mismatch;		goto mismatch;

	@@ -630,7 +633,6 @@ static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;		struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
	struct ieee802_11_elems elems;		struct ieee802_11_elems elems;
	struct ieee80211_channel *channel;		struct ieee80211_channel *channel;
	u32 supp_rates = 0, basic_rates = 0;
	size_t baselen;		size_t baselen;
	int freq;		int freq;
	enum ieee80211_band band = rx_status->band;		enum ieee80211_band band = rx_status->band;
	@@ -661,12 +663,9 @@ static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
	if (!channel \|\| channel->flags & IEEE80211_CHAN_DISABLED)		if (!channel \|\| channel->flags & IEEE80211_CHAN_DISABLED)
	return;		return;

	supp_rates = ieee80211_sta_get_rates(local, &elems,
	band, &basic_rates);

	if (elems.mesh_id && elems.mesh_config &&		if (elems.mesh_id && elems.mesh_config &&
	mesh_matches_local(&elems, sdata, basic_rates))		mesh_matches_local(sdata, &elems))
	mesh_neighbour_update(mgmt->sa, supp_rates, sdata, &elems);		mesh_neighbour_update(sdata, mgmt->sa, &elems);

	if (ifmsh->sync_ops)		if (ifmsh->sync_ops)
	ifmsh->sync_ops->rx_bcn_presp(sdata,		ifmsh->sync_ops->rx_bcn_presp(sdata,

net/mac80211/mesh.h

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -222,8 +222,8 @@ int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr,
	char *addr6);		char *addr6);
	int mesh_rmc_check(u8 addr, struct ieee80211s_hdr mesh_hdr,		int mesh_rmc_check(u8 addr, struct ieee80211s_hdr mesh_hdr,
	struct ieee80211_sub_if_data *sdata);		struct ieee80211_sub_if_data *sdata);
	bool mesh_matches_local(struct ieee802_11_elems *ie,		bool mesh_matches_local(struct ieee80211_sub_if_data *sdata,
	struct ieee80211_sub_if_data *sdata, u32 basic_rates);		struct ieee802_11_elems *ie);
	void mesh_ids_set_default(struct ieee80211_if_mesh *mesh);		void mesh_ids_set_default(struct ieee80211_if_mesh *mesh);
	void mesh_mgmt_ies_add(struct sk_buff *skb,		void mesh_mgmt_ies_add(struct sk_buff *skb,
	struct ieee80211_sub_if_data *sdata);		struct ieee80211_sub_if_data *sdata);
	@@ -276,8 +276,8 @@ int mesh_path_add_gate(struct mesh_path *mpath);
	int mesh_path_send_to_gates(struct mesh_path *mpath);		int mesh_path_send_to_gates(struct mesh_path *mpath);
	int mesh_gate_num(struct ieee80211_sub_if_data *sdata);		int mesh_gate_num(struct ieee80211_sub_if_data *sdata);
	/* Mesh plinks */		/* Mesh plinks */
	void mesh_neighbour_update(u8 *hw_addr, u32 rates,		void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata,
	struct ieee80211_sub_if_data *sdata,		u8 *hw_addr,
	struct ieee802_11_elems *ie);		struct ieee802_11_elems *ie);
	bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie);		bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie);
	void mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata);		void mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata);

net/mac80211/mesh_plink.c

+11 −14

Original line number	Original line	Diff line number	Diff line
	@@ -268,20 +268,22 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
	*		*
	* @sdata: local meshif		* @sdata: local meshif
	* @addr: peer's address		* @addr: peer's address
	* @rates: station's supported rates
	* @elems: IEs from beacon or mesh peering frame		* @elems: IEs from beacon or mesh peering frame
	*		*
	* call under RCU		* call under RCU
	*/		*/
	static struct sta_info mesh_peer_init(struct ieee80211_sub_if_data sdata,		static struct sta_info mesh_peer_init(struct ieee80211_sub_if_data sdata,
	u8 *addr, u32 rates,		u8 *addr,
	struct ieee802_11_elems *elems)		struct ieee802_11_elems *elems)
	{		{
	struct ieee80211_local *local = sdata->local;		struct ieee80211_local *local = sdata->local;
			enum ieee80211_band band = local->oper_channel->band;
	struct ieee80211_supported_band *sband;		struct ieee80211_supported_band *sband;
			u32 rates, basic_rates = 0;
	struct sta_info *sta;		struct sta_info *sta;

	sband = local->hw.wiphy->bands[local->oper_channel->band];		sband = local->hw.wiphy->bands[band];
			rates = ieee80211_sta_get_rates(local, elems, band, &basic_rates);

	sta = sta_info_get(sdata, addr);		sta = sta_info_get(sdata, addr);
	if (!sta) {		if (!sta) {
	@@ -292,7 +294,7 @@ static struct sta_info mesh_peer_init(struct ieee80211_sub_if_data sdata,

	spin_lock_bh(&sta->lock);		spin_lock_bh(&sta->lock);
	sta->last_rx = jiffies;		sta->last_rx = jiffies;
	sta->sta.supp_rates[local->hw.conf.channel->band] = rates;		sta->sta.supp_rates[band] = rates;
	if (elems->ht_cap_elem)		if (elems->ht_cap_elem)
	ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,		ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
	elems->ht_cap_elem,		elems->ht_cap_elem,
	@@ -306,8 +308,8 @@ static struct sta_info mesh_peer_init(struct ieee80211_sub_if_data sdata,
	return sta;		return sta;
	}		}

	void mesh_neighbour_update(u8 *hw_addr, u32 rates,		void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata,
	struct ieee80211_sub_if_data *sdata,		u8 *hw_addr,
	struct ieee802_11_elems *elems)		struct ieee802_11_elems *elems)
	{		{
	struct sta_info *sta;		struct sta_info *sta;
	@@ -322,7 +324,7 @@ void mesh_neighbour_update(u8 *hw_addr, u32 rates,
	}		}

	rcu_read_lock();		rcu_read_lock();
	sta = mesh_peer_init(sdata, hw_addr, rates, elems);		sta = mesh_peer_init(sdata, hw_addr, elems);
	if (!sta)		if (!sta)
	goto out;		goto out;

	@@ -479,7 +481,6 @@ void mesh_plink_block(struct sta_info *sta)
	void mesh_rx_plink_frame(struct ieee80211_sub_if_data sdata, struct ieee80211_mgmt mgmt,		void mesh_rx_plink_frame(struct ieee80211_sub_if_data sdata, struct ieee80211_mgmt mgmt,
	size_t len, struct ieee80211_rx_status *rx_status)		size_t len, struct ieee80211_rx_status *rx_status)
	{		{
	struct ieee80211_local *local = sdata->local;
	struct ieee802_11_elems elems;		struct ieee802_11_elems elems;
	struct sta_info *sta;		struct sta_info *sta;
	enum plink_event event;		enum plink_event event;
	@@ -488,7 +489,6 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
	bool deactivated, matches_local = true;		bool deactivated, matches_local = true;
	u8 ie_len;		u8 ie_len;
	u8 *baseaddr;		u8 *baseaddr;
	u32 rates, basic_rates = 0;
	__le16 plid, llid, reason;		__le16 plid, llid, reason;
	#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG		#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
	static const char *mplstates[] = {		static const char *mplstates[] = {
	@@ -583,11 +583,8 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m

	/* Now we will figure out the appropriate event... */		/* Now we will figure out the appropriate event... */
	event = PLINK_UNDEFINED;		event = PLINK_UNDEFINED;
	rates = ieee80211_sta_get_rates(local, &elems,
	rx_status->band, &basic_rates);

	if (ftype != WLAN_SP_MESH_PEERING_CLOSE &&		if (ftype != WLAN_SP_MESH_PEERING_CLOSE &&
	(!mesh_matches_local(&elems, sdata, basic_rates))) {		!mesh_matches_local(sdata, &elems)) {
	matches_local = false;		matches_local = false;
	switch (ftype) {		switch (ftype) {
	case WLAN_SP_MESH_PEERING_OPEN:		case WLAN_SP_MESH_PEERING_OPEN:
	@@ -660,7 +657,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m

	if (event == OPN_ACPT) {		if (event == OPN_ACPT) {
	/* allocate sta entry if necessary and update info */		/* allocate sta entry if necessary and update info */
	sta = mesh_peer_init(sdata, mgmt->sa, rates, &elems);		sta = mesh_peer_init(sdata, mgmt->sa, &elems);
	if (!sta) {		if (!sta) {
	mpl_dbg("Mesh plink: failed to init peer!\n");		mpl_dbg("Mesh plink: failed to init peer!\n");
	rcu_read_unlock();		rcu_read_unlock();