linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michal Kazior <michal.kazior@tieto.com>
To: ath10k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org, Michal Kazior <michal.kazior@tieto.com>
Subject: [PATCH v2 4/7] ath10k: protect ar->arvifs linking with data_lock
Date: Fri, 30 Jan 2015 13:31:23 +0100	[thread overview]
Message-ID: <1422621086-28970-5-git-send-email-michal.kazior@tieto.com> (raw)
In-Reply-To: <1422621086-28970-1-git-send-email-michal.kazior@tieto.com>

This will make it possible to iterate over
interface list while in an atomic context,
i.e. tasklet.

Caller should still be careful with accessing
arvif structures though.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
---
 drivers/net/wireless/ath/ath10k/mac.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index e099479..ba66a67 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3331,7 +3331,10 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
 	}
 
 	ar->free_vdev_map &= ~(1LL << arvif->vdev_id);
+
+	spin_lock_bh(&ar->data_lock);
 	list_add(&arvif->list, &ar->arvifs);
+	spin_unlock_bh(&ar->data_lock);
 
 	/* It makes no sense to have firmware do keepalives. mac80211 already
 	 * takes care of this with idle connection polling.
@@ -3458,7 +3461,9 @@ err_peer_delete:
 err_vdev_delete:
 	ath10k_wmi_vdev_delete(ar, arvif->vdev_id);
 	ar->free_vdev_map |= 1LL << arvif->vdev_id;
+	spin_lock_bh(&ar->data_lock);
 	list_del(&arvif->list);
+	spin_unlock_bh(&ar->data_lock);
 
 err:
 	if (arvif->beacon_buf) {
@@ -3493,7 +3498,10 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw,
 			    arvif->vdev_id, ret);
 
 	ar->free_vdev_map |= 1LL << arvif->vdev_id;
+
+	spin_lock_bh(&ar->data_lock);
 	list_del(&arvif->list);
+	spin_unlock_bh(&ar->data_lock);
 
 	if (arvif->vdev_type == WMI_VDEV_TYPE_AP) {
 		ret = ath10k_peer_delete(arvif->ar, arvif->vdev_id, vif->addr);
-- 
1.8.5.3


  parent reply	other threads:[~2015-01-30 12:33 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-30  8:41 [PATCH 0/7] ath10k: add multi-channel support Michal Kazior
2015-01-30  8:41 ` [PATCH 1/7] ath10k: allow empty ssid vdev config Michal Kazior
2015-01-30  8:41 ` [PATCH 2/7] ath10k: implement chanctx API Michal Kazior
2015-01-30 10:44   ` Michal Kazior
2015-01-30  8:41 ` [PATCH 3/7] ath10k: implement adaptive qcs command Michal Kazior
2015-01-30  8:41 ` [PATCH 4/7] ath10k: protect ar->arvifs linking with data_lock Michal Kazior
2015-01-30  8:41 ` [PATCH 5/7] ath10k: rework tx queue locking Michal Kazior
2015-01-30  8:41 ` [PATCH 6/7] ath10k: implement tx pause wmi event Michal Kazior
2015-01-30  8:41 ` [PATCH 7/7] ath10k: enable multi-channel on supported devices Michal Kazior
2015-01-30 12:31 ` [PATCH v2 0/7] ath10k: add multi-channel support Michal Kazior
2015-01-30 12:31   ` [PATCH v2 1/7] ath10k: allow empty ssid vdev config Michal Kazior
2015-01-30 12:31   ` [PATCH v2 2/7] ath10k: implement chanctx API Michal Kazior
2015-01-30 12:45     ` Johannes Berg
2015-01-30 13:02       ` Michal Kazior
2015-01-30 13:04         ` Johannes Berg
2015-01-30 13:22           ` Michal Kazior
2015-01-30 13:31             ` Johannes Berg
2015-01-30 13:47               ` Michal Kazior
2015-01-30 14:06                 ` Johannes Berg
2015-01-30 12:58     ` Johannes Berg
2015-01-30 13:06       ` Michal Kazior
2015-01-30 13:10         ` Johannes Berg
2015-01-30 14:01           ` Michal Kazior
2015-01-30 14:10             ` Johannes Berg
2015-01-30 12:31   ` [PATCH v2 3/7] ath10k: implement adaptive qcs command Michal Kazior
2015-01-30 12:31   ` Michal Kazior [this message]
2015-01-30 12:31   ` [PATCH v2 5/7] ath10k: rework tx queue locking Michal Kazior
2015-01-30 12:31   ` [PATCH v2 6/7] ath10k: implement tx pause wmi event Michal Kazior
2015-01-30 12:31   ` [PATCH v2 7/7] ath10k: enable multi-channel on supported devices Michal Kazior

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=1422621086-28970-5-git-send-email-michal.kazior@tieto.com \
    --to=michal.kazior@tieto.com \
    --cc=ath10k@lists.infradead.org \
    --cc=linux-wireless@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).