|
|
@@ -78,6 +78,10 @@ int cw1200_hw_scan(struct ieee80211_hw *hw,
|
|
|
if (req->n_ssids > WSM_SCAN_MAX_NUM_OF_SSIDS)
|
|
|
return -EINVAL;
|
|
|
|
|
|
+ /* will be unlocked in cw1200_scan_work() */
|
|
|
+ down(&priv->scan.lock);
|
|
|
+ mutex_lock(&priv->conf_mutex);
|
|
|
+
|
|
|
frame.skb = ieee80211_probereq_get(hw, priv->vif->addr, NULL, 0,
|
|
|
req->ie_len);
|
|
|
if (!frame.skb)
|
|
|
@@ -86,19 +90,15 @@ int cw1200_hw_scan(struct ieee80211_hw *hw,
|
|
|
if (req->ie_len)
|
|
|
skb_put_data(frame.skb, req->ie, req->ie_len);
|
|
|
|
|
|
- /* will be unlocked in cw1200_scan_work() */
|
|
|
- down(&priv->scan.lock);
|
|
|
- mutex_lock(&priv->conf_mutex);
|
|
|
-
|
|
|
ret = wsm_set_template_frame(priv, &frame);
|
|
|
if (!ret) {
|
|
|
/* Host want to be the probe responder. */
|
|
|
ret = wsm_set_probe_responder(priv, true);
|
|
|
}
|
|
|
if (ret) {
|
|
|
+ dev_kfree_skb(frame.skb);
|
|
|
mutex_unlock(&priv->conf_mutex);
|
|
|
up(&priv->scan.lock);
|
|
|
- dev_kfree_skb(frame.skb);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
@@ -120,10 +120,9 @@ int cw1200_hw_scan(struct ieee80211_hw *hw,
|
|
|
++priv->scan.n_ssids;
|
|
|
}
|
|
|
|
|
|
- mutex_unlock(&priv->conf_mutex);
|
|
|
-
|
|
|
if (frame.skb)
|
|
|
dev_kfree_skb(frame.skb);
|
|
|
+ mutex_unlock(&priv->conf_mutex);
|
|
|
queue_work(priv->workqueue, &priv->scan.work);
|
|
|
return 0;
|
|
|
}
|