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

Commit 7bd305f5 authored Dec 11, 2023 by Johannes Berg Committed by Greg Kroah-Hartman Jan 08, 2024

wifi: mac80211: mesh_plink: fix matches_local logic



[ Upstream commit 8c386b166e2517cf3a123018e77941ec22625d0f ]

During refactoring the "else" here got lost, add it back.

Fixes: c99a89ed ("mac80211: factor out plink event gathering")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20231211085121.795480fa0e0b.I017d501196a5bbdcd9afd33338d342d6fe1edd79@changeid


Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 76366b39

net/mac80211/mesh_plink.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -1044,7 +1044,7 @@ mesh_plink_get_event(struct ieee80211_sub_if_data *sdata,
		case WLAN_SP_MESH_PEERING_OPEN:
		if (!matches_local)
		event = OPN_RJCT;
		if (!mesh_plink_free_count(sdata) \|\|
		else if (!mesh_plink_free_count(sdata) \|\|
		(sta->mesh->plid && sta->mesh->plid != plid))
		event = OPN_IGNR;
		else
		@@ -1053,7 +1053,7 @@ mesh_plink_get_event(struct ieee80211_sub_if_data *sdata,
		case WLAN_SP_MESH_PEERING_CONFIRM:
		if (!matches_local)
		event = CNF_RJCT;
		if (!mesh_plink_free_count(sdata) \|\|
		else if (!mesh_plink_free_count(sdata) \|\|
		sta->mesh->llid != llid \|\|
		(sta->mesh->plid && sta->mesh->plid != plid))
		event = CNF_IGNR;