Skip to content

Commit 8c386b1

Browse files
committed
wifi: mac80211: mesh_plink: fix matches_local logic
During refactoring the "else" here got lost, add it back. Fixes: c99a89e ("mac80211: factor out plink event gathering") Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: Miri Korenblit <[email protected]> Link: https://msgid.link/20231211085121.795480fa0e0b.I017d501196a5bbdcd9afd33338d342d6fe1edd79@changeid Signed-off-by: Johannes Berg <[email protected]>
1 parent 1fc4a3e commit 8c386b1

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

net/mac80211/mesh_plink.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,18 +1068,18 @@ mesh_plink_get_event(struct ieee80211_sub_if_data *sdata,
10681068
case WLAN_SP_MESH_PEERING_OPEN:
10691069
if (!matches_local)
10701070
event = OPN_RJCT;
1071-
if (!mesh_plink_free_count(sdata) ||
1072-
(sta->mesh->plid && sta->mesh->plid != plid))
1071+
else if (!mesh_plink_free_count(sdata) ||
1072+
(sta->mesh->plid && sta->mesh->plid != plid))
10731073
event = OPN_IGNR;
10741074
else
10751075
event = OPN_ACPT;
10761076
break;
10771077
case WLAN_SP_MESH_PEERING_CONFIRM:
10781078
if (!matches_local)
10791079
event = CNF_RJCT;
1080-
if (!mesh_plink_free_count(sdata) ||
1081-
sta->mesh->llid != llid ||
1082-
(sta->mesh->plid && sta->mesh->plid != plid))
1080+
else if (!mesh_plink_free_count(sdata) ||
1081+
sta->mesh->llid != llid ||
1082+
(sta->mesh->plid && sta->mesh->plid != plid))
10831083
event = CNF_IGNR;
10841084
else
10851085
event = CNF_ACPT;

0 commit comments

Comments
 (0)