Skip to content

Commit

Permalink
ath10k: protect wep tx key setup
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
  • Loading branch information
Michal Kazior authored and Kalle Valo committed May 27, 2014
1 parent bca7baf commit 911e6c0
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions drivers/net/wireless/ath/ath10k/mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1891,8 +1891,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);
Expand All @@ -1905,10 +1910,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)
Expand Down

0 comments on commit 911e6c0

Please sign in to comment.