From: Jouni Malinen Date: Sun, 19 Jun 2016 20:51:02 +0000 (+0300) Subject: mac80211: Fix mesh estab_plinks counting in STA removal case X-Git-Tag: v3.16.37~59 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93917b0558024254d5b64d0a3f02e0a86d760ec2;p=thirdparty%2Fkernel%2Fstable.git mac80211: Fix mesh estab_plinks counting in STA removal case commit 126e7557328a1cd576be4fca95b133a2695283ff upstream. If a user space program (e.g., wpa_supplicant) deletes a STA entry that is currently in NL80211_PLINK_ESTAB state, the number of established plinks counter was not decremented and this could result in rejecting new plink establishment before really hitting the real maximum plink limit. For !user_mpm case, this decrementation is handled by mesh_plink_deactive(). Fix this by decrementing estab_plinks on STA deletion (mesh_sta_cleanup() gets called from there) so that the counter has a correct value and the Beacon frame advertisement in Mesh Configuration element shows the proper value for capability to accept additional peers. Signed-off-by: Jouni Malinen Signed-off-by: Johannes Berg [bwh: Backported to 3.16: plink_state field is in struct sta_info] Signed-off-by: Ben Hutchings --- diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 105e5fb0e3782..27b5b3b437444 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -148,14 +148,17 @@ u32 mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata) void mesh_sta_cleanup(struct sta_info *sta) { struct ieee80211_sub_if_data *sdata = sta->sdata; - u32 changed; + u32 changed = 0; /* * maybe userspace handles peer allocation and peering, but in either * case the beacon is still generated by the kernel and we might need * an update. */ - changed = mesh_accept_plinks_update(sdata); + if (sdata->u.mesh.user_mpm && + sta->plink_state == NL80211_PLINK_ESTAB) + changed |= mesh_plink_dec_estab_count(sdata); + changed |= mesh_accept_plinks_update(sdata); if (!sdata->u.mesh.user_mpm) { changed |= mesh_plink_deactivate(sta); del_timer_sync(&sta->plink_timer);