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/5] ath10k: protect wep tx key setup
Date: Thu, 15 May 2014 10:42:03 +0200 [thread overview]
Message-ID: <1400143324-14911-5-git-send-email-michal.kazior@tieto.com> (raw)
In-Reply-To: <1400143324-14911-1-git-send-email-michal.kazior@tieto.com>
All configuration sequences should be protected
with conf_mutex to avoid concurrent/conflicting
requests.
This should make sure that wep tx key setup is not
performed while hw is restarted (at least).
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
---
v2:
* skip wep update if state != ON [Kalle]
* add empty space before goto label [Kalle]
drivers/net/wireless/ath/ath10k/mac.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 577a3a5..e474eca 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -1888,8 +1888,13 @@ static void ath10k_tx_wep_key_work(struct work_struct *work)
wep_key_work);
int ret, keyidx = arvif->def_wep_key_newidx;
+ mutex_lock(&arvif->ar->conf_mutex);
+
+ if (arvif->ar->state != ATH10K_STATE_ON)
+ goto unlock;
+
if (arvif->def_wep_key_idx == keyidx)
- return;
+ goto unlock;
ath10k_dbg(ATH10K_DBG_MAC, "mac vdev %d set keyidx %d\n",
arvif->vdev_id, keyidx);
@@ -1902,10 +1907,13 @@ static void ath10k_tx_wep_key_work(struct work_struct *work)
ath10k_warn("failed to update wep key index for vdev %d: %d\n",
arvif->vdev_id,
ret);
- return;
+ goto unlock;
}
arvif->def_wep_key_idx = keyidx;
+
+unlock:
+ mutex_unlock(&arvif->ar->conf_mutex);
}
static void ath10k_tx_h_update_wep_key(struct sk_buff *skb)
--
1.8.5.3
next prev parent reply other threads:[~2014-05-15 8:49 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-09 12:15 [PATCH 0/5] ath10k: recovery fixes 2014-05-09 Michal Kazior
2014-05-09 12:15 ` [PATCH 1/5] ath10k: clean up start() callback Michal Kazior
2014-05-14 19:07 ` Kalle Valo
2014-05-09 12:15 ` [PATCH 2/5] ath10k: perform hw restart lazily Michal Kazior
2014-05-09 12:15 ` [PATCH 3/5] ath10k: drain tx before restarting hw Michal Kazior
2014-05-09 12:15 ` [PATCH 4/5] ath10k: protect wep tx key setup Michal Kazior
2014-05-14 19:17 ` Kalle Valo
2014-05-14 19:50 ` Kalle Valo
2014-05-15 6:04 ` Michal Kazior
2014-05-09 12:15 ` [PATCH 5/5] ath10k: dont configure bssid for ap mode Michal Kazior
2014-05-14 18:58 ` Kalle Valo
2014-05-15 8:41 ` [PATCH v2 0/5] ath10k: recovery fixes 2014-05-09 Michal Kazior
2014-05-15 8:42 ` [PATCH v2 1/5] ath10k: clean up start() callback Michal Kazior
2014-05-15 8:42 ` [PATCH v2 2/5] ath10k: perform hw restart lazily Michal Kazior
2014-05-15 8:42 ` [PATCH v2 3/5] ath10k: drain tx before restarting hw Michal Kazior
2014-05-15 13:18 ` Kalle Valo
2014-05-16 14:37 ` Kalle Valo
2014-05-23 8:27 ` Kalle Valo
2014-05-23 8:38 ` Michal Kazior
2014-05-23 8:45 ` Kalle Valo
2014-05-23 9:06 ` Michal Kazior
2014-05-23 10:31 ` Kalle Valo
2014-05-23 10:37 ` Michal Kazior
2014-05-23 13:03 ` Johannes Berg
2014-05-26 5:48 ` Michal Kazior
2014-05-26 6:29 ` Johannes Berg
2014-05-26 9:40 ` Kalle Valo
2014-05-26 9:43 ` Michal Kazior
2014-05-15 8:42 ` Michal Kazior [this message]
2014-05-15 8:42 ` [PATCH v2 5/5] ath10k: dont configure bssid for ap mode Michal Kazior
2014-05-27 9:29 ` [PATCH v2 0/5] ath10k: recovery fixes 2014-05-09 Kalle Valo
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=1400143324-14911-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).