Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b091cd4 authored by Luis Carlos Cobo's avatar Luis Carlos Cobo Committed by John W. Linville
Browse files

mac80211: move comment to better location 



Signed-off-by: default avatarLuis Carlos Cobo <luisca@cozybit.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1d1b5359

net/mac80211/mesh.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -48,11 +48,6 @@ bool mesh_matches_local(struct ieee802_11_elems *ie, struct net_device *dev) 
	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct ieee80211_if_sta *sta = &sdata->u.sta;

	struct ieee80211_if_sta *sta = &sdata->u.sta;





	if (sta->mesh_id_len == ie->mesh_id_len &&

		memcmp(sta->mesh_id, ie->mesh_id, ie->mesh_id_len) == 0 &&

		memcmp(sta->mesh_pp_id, ie->mesh_config + PP_OFFSET, 4) == 0 &&

		memcmp(sta->mesh_pm_id, ie->mesh_config + PM_OFFSET, 4) == 0 &&

		memcmp(sta->mesh_cc_id, ie->mesh_config + CC_OFFSET, 4) == 0)

	/*

	/*

	 * As support for each feature is added, check for matching

	 * As support for each feature is added, check for matching

	 * - On mesh config capabilities

	 * - On mesh config capabilities
@@ -63,6 +58,11 @@ bool mesh_matches_local(struct ieee802_11_elems *ie, struct net_device *dev) 
	 *   - MDA enabled

	 *   - MDA enabled

	 * - Power management control on fc

	 * - Power management control on fc

	 */

	 */

	if (sta->mesh_id_len == ie->mesh_id_len &&

		memcmp(sta->mesh_id, ie->mesh_id, ie->mesh_id_len) == 0 &&

		memcmp(sta->mesh_pp_id, ie->mesh_config + PP_OFFSET, 4) == 0 &&

		memcmp(sta->mesh_pm_id, ie->mesh_config + PM_OFFSET, 4) == 0 &&

		memcmp(sta->mesh_cc_id, ie->mesh_config + CC_OFFSET, 4) == 0)

		return true;

		return true;





	return false;

	return false;