Browse Source

wil6210: serialize fw_recovery and start_ap

These methods can change device state, serialize with others
similar ones like up/down

Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Vladimir Kondratiev 11 years ago
parent
commit
9c3bde56b7

+ 11 - 4
drivers/net/wireless/ath/wil6210/cfg80211.c

@@ -609,18 +609,20 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy,
 	if (wil_fix_bcon(wil, bcon))
 	if (wil_fix_bcon(wil, bcon))
 		wil_dbg_misc(wil, "Fixed bcon\n");
 		wil_dbg_misc(wil, "Fixed bcon\n");
 
 
+	mutex_lock(&wil->mutex);
+
 	rc = wil_reset(wil);
 	rc = wil_reset(wil);
 	if (rc)
 	if (rc)
-		return rc;
+		goto out;
 
 
 	/* Rx VRING. */
 	/* Rx VRING. */
 	rc = wil_rx_init(wil);
 	rc = wil_rx_init(wil);
 	if (rc)
 	if (rc)
-		return rc;
+		goto out;
 
 
 	rc = wmi_set_ssid(wil, info->ssid_len, info->ssid);
 	rc = wmi_set_ssid(wil, info->ssid_len, info->ssid);
 	if (rc)
 	if (rc)
-		return rc;
+		goto out;
 
 
 	/* MAC address - pre-requisite for other commands */
 	/* MAC address - pre-requisite for other commands */
 	wmi_set_mac_address(wil, ndev->dev_addr);
 	wmi_set_mac_address(wil, ndev->dev_addr);
@@ -644,11 +646,13 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy,
 	rc = wmi_pcp_start(wil, info->beacon_interval, wmi_nettype,
 	rc = wmi_pcp_start(wil, info->beacon_interval, wmi_nettype,
 			   channel->hw_value);
 			   channel->hw_value);
 	if (rc)
 	if (rc)
-		return rc;
+		goto out;
 
 
 
 
 	netif_carrier_on(ndev);
 	netif_carrier_on(ndev);
 
 
+out:
+	mutex_unlock(&wil->mutex);
 	return rc;
 	return rc;
 }
 }
 
 
@@ -658,8 +662,11 @@ static int wil_cfg80211_stop_ap(struct wiphy *wiphy,
 	int rc = 0;
 	int rc = 0;
 	struct wil6210_priv *wil = wiphy_to_wil(wiphy);
 	struct wil6210_priv *wil = wiphy_to_wil(wiphy);
 
 
+	mutex_lock(&wil->mutex);
+
 	rc = wmi_pcp_stop(wil);
 	rc = wmi_pcp_stop(wil);
 
 
+	mutex_unlock(&wil->mutex);
 	return rc;
 	return rc;
 }
 }
 
 

+ 2 - 0
drivers/net/wireless/ath/wil6210/main.c

@@ -159,6 +159,7 @@ static void wil_fw_error_worker(struct work_struct *work)
 	if (no_fw_recovery)
 	if (no_fw_recovery)
 		return;
 		return;
 
 
+	mutex_lock(&wil->mutex);
 	switch (wdev->iftype) {
 	switch (wdev->iftype) {
 	case NL80211_IFTYPE_STATION:
 	case NL80211_IFTYPE_STATION:
 	case NL80211_IFTYPE_P2P_CLIENT:
 	case NL80211_IFTYPE_P2P_CLIENT:
@@ -176,6 +177,7 @@ static void wil_fw_error_worker(struct work_struct *work)
 	default:
 	default:
 		break;
 		break;
 	}
 	}
+	mutex_unlock(&wil->mutex);
 }
 }
 
 
 static int wil_find_free_vring(struct wil6210_priv *wil)
 static int wil_find_free_vring(struct wil6210_priv *wil)