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: Maital Hahn <maitalm@ti.com>
Subject: [PATCH 1/4] mac80211: mesh: flush stations before beacons are stopped
Date: Tue, 28 Jun 2016 14:13:04 +0300 [thread overview]
Message-ID: <20160628111307.8784-2-yanivma@ti.com> (raw)
In-Reply-To: <20160628111307.8784-1-yanivma@ti.com>
From: Maital Hahn <maitalm@ti.com>
Some drivers (e.g. wl18xx) expect that the last stage in the
de-initialization process will be stopping the beacons, similar to ap.
Update ieee80211_stop_mesh() flow accordingly.
Signed-off-by: Maital Hahn <maitalm@ti.com>
Acked-by: Yaniv Machani <yanivma@ti.com>
---
net/mac80211/mesh.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 21b1fdf..9214bc1 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -896,20 +896,22 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
netif_carrier_off(sdata->dev);
+ /* flush STAs and mpaths on this iface */
+ sta_info_flush(sdata);
+ mesh_path_flush_by_iface(sdata);
+
/* stop the beacon */
ifmsh->mesh_id_len = 0;
sdata->vif.bss_conf.enable_beacon = false;
clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);
ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
+
+ /* remove beacon */
bcn = rcu_dereference_protected(ifmsh->beacon,
lockdep_is_held(&sdata->wdev.mtx));
RCU_INIT_POINTER(ifmsh->beacon, NULL);
kfree_rcu(bcn, rcu_head);
- /* flush STAs and mpaths on this iface */
- sta_info_flush(sdata);
- mesh_path_flush_by_iface(sdata);
-
/* free all potentially still buffered group-addressed frames */
local->total_ps_buffered -= skb_queue_len(&ifmsh->ps.bc_buf);
skb_queue_purge(&ifmsh->ps.bc_buf);
--
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 ` Yaniv Machani [this message]
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 ` [PATCH 4/4] mac80211: sta_info: max_peers reached falsely Yaniv Machani
2016-06-28 12:56 ` 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-2-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=maitalm@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;
as well as URLs for NNTP newsgroup(s).