xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: mac80211: mesh_plink: fix matches_local logic

Browse Source 
[ Upstream commit 8c386b166e2517cf3a123018e77941ec22625d0f ]

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

Fixes: c99a89edb1 ("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>
This commit is contained in:
Johannes Berg
2023-12-11 09:05:31 +02:00
committed by Greg Kroah-Hartman
parent 717f08fb51
commit b851889e91
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/mesh_plink.c
View File

@@ -1050,7 +1050,7 @@ mesh_plink_get_event(struct ieee80211_sub_if_data *sdata,
case WLAN_SP_MESH_PEERING_OPEN: case WLAN_SP_MESH_PEERING_OPEN:
if (!matches_local) if (!matches_local)
event = OPN_RJCT; event = OPN_RJCT;
if (!mesh_plink_free_count(sdata) || else if (!mesh_plink_free_count(sdata) ||
(sta->mesh->plid && sta->mesh->plid != plid)) (sta->mesh->plid && sta->mesh->plid != plid))
event = OPN_IGNR; event = OPN_IGNR;
else else
@@ -1059,7 +1059,7 @@ mesh_plink_get_event(struct ieee80211_sub_if_data *sdata,
case WLAN_SP_MESH_PEERING_CONFIRM: case WLAN_SP_MESH_PEERING_CONFIRM:
if (!matches_local) if (!matches_local)
event = CNF_RJCT; event = CNF_RJCT;
if (!mesh_plink_free_count(sdata) || else if (!mesh_plink_free_count(sdata) ||
sta->mesh->llid != llid || sta->mesh->llid != llid ||
(sta->mesh->plid && sta->mesh->plid != plid)) (sta->mesh->plid && sta->mesh->plid != plid))
event = CNF_IGNR; event = CNF_IGNR;