From: Yaniv Machani <yanivma@ti.com>
To: <linux-kernel@vger.kernel.org>,
Johannes Berg <johannes@sipsolutions.net>,
"David S . Miller" <davem@davemloft.net>,
<linux-wireless@vger.kernel.org>, <netdev@vger.kernel.org>
Cc: Meirav Kama <meiravk@ti.com>
Subject: [PATCH 4/4] mac80211: sta_info: max_peers reached falsely
Date: Tue, 28 Jun 2016 14:13:07 +0300 [thread overview]
Message-ID: <20160628111307.8784-5-yanivma@ti.com> (raw)
In-Reply-To: <20160628111307.8784-4-yanivma@ti.com>
From: Meirav Kama <meiravk@ti.com>
Issue happened when receiving delete_sta command without
changing plink_state from ESTAB to HOLDING before.
When receiving delete_sta command for mesh interface
verify plink_state is not ESTAB and if so, decrease
plink count and update beacon.
Signed-off-by: Meirav Kama <meiravk@ti.com>
Acked-by: Yaniv Machani <yanivma@ti.com>
---
net/mac80211/sta_info.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 76b737d..1ce6320 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -1009,11 +1009,25 @@ int sta_info_destroy_addr_bss(struct ieee80211_sub_if_data *sdata,
{
struct sta_info *sta;
int ret;
+#ifdef CONFIG_MAC80211_MESH
+ bool dec_links = false;
+#endif
mutex_lock(&sdata->local->sta_mtx);
sta = sta_info_get_bss(sdata, addr);
+#ifdef CONFIG_MAC80211_MESH
+ if (sdata->vif.type == NL80211_IFTYPE_MESH_POINT &&
+ sta->mesh->plink_state == NL80211_PLINK_ESTAB)
+ dec_links = true;
+#endif
ret = __sta_info_destroy(sta);
mutex_unlock(&sdata->local->sta_mtx);
+#ifdef CONFIG_MAC80211_MESH
+ if (dec_links) {
+ mesh_plink_dec_estab_count(sdata);
+ ieee80211_mbss_info_change_notify(sdata, BSS_CHANGED_BEACON);
+ }
+#endif
return ret;
}
--
2.9.0
next prev parent reply other threads:[~2016-06-28 11:11 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-28 11:13 [PATCH 0/4] Mesh mpm fixes and enhancements Yaniv Machani
2016-06-28 11:13 ` [PATCH 1/4] mac80211: mesh: flush stations before beacons are stopped Yaniv Machani
2016-06-28 11:13 ` [PATCH 2/4] mac80211/cfg: mesh: fix healing time when a mesh peer is disconnecting Yaniv Machani
2016-06-28 11:13 ` [PATCH 3/4] mac80211: mesh: fixed HT ies in beacon template Yaniv Machani
2016-06-28 11:13 ` Yaniv Machani [this message]
2016-06-28 12:56 ` [PATCH 4/4] mac80211: sta_info: max_peers reached falsely Bob Copeland
2016-06-28 13:05 ` Machani, Yaniv
2016-06-28 14:06 ` [PATCH 3/4] mac80211: mesh: fixed HT ies in beacon template Bob Copeland
2016-06-29 7:17 ` Johannes Berg
2016-07-13 11:15 ` Machani, Yaniv
2016-06-28 12:27 ` [PATCH 2/4] mac80211/cfg: mesh: fix healing time when a mesh peer is disconnecting Bob Copeland
2016-06-28 14:43 ` Machani, Yaniv
2016-06-29 7:14 ` [PATCH 1/4] mac80211: mesh: flush stations before beacons are stopped Johannes Berg
2016-07-13 10:11 ` Machani, Yaniv
2016-07-13 13:33 ` Bob Copeland
2016-07-13 19:54 ` Machani, Yaniv
2016-08-01 9:38 ` Johannes Berg
2016-06-29 4:43 ` [PATCH 0/4] Mesh mpm fixes and enhancements Julian Calaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160628111307.8784-5-yanivma@ti.com \
--to=yanivma@ti.com \
--cc=davem@davemloft.net \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=meiravk@ti.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®