Merge "wil6210: fix protection of wil->scan_request" (2ae673fa) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/ath/wil6210/cfg80211.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -353,10 +353,13 @@ static int wil_cfg80211_scan(struct wiphy *wiphy,
		wil_dbg_misc(wil, "%s(), wdev=0x%p iftype=%d\n",
		__func__, wdev, wdev->iftype);

		mutex_lock(&wil->p2p_wdev_mutex);
		if (wil->scan_request) {
		wil_err(wil, "Already scanning\n");
		mutex_unlock(&wil->p2p_wdev_mutex);
		return -EAGAIN;
		}
		mutex_unlock(&wil->p2p_wdev_mutex);

		/* check we are client side */
		switch (wdev->iftype) {

+4 −0

Original line number	Diff line number	Diff line
		@@ -852,6 +852,7 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw)
		bitmap_zero(wil->status, wil_status_last);
		mutex_unlock(&wil->wmi_mutex);

		mutex_lock(&wil->p2p_wdev_mutex);
		if (wil->scan_request) {
		wil_dbg_misc(wil, "Abort scan_request 0x%p\n",
		wil->scan_request);
		@@ -859,6 +860,7 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw)
		cfg80211_scan_done(wil->scan_request, true);
		wil->scan_request = NULL;
		}
		mutex_unlock(&wil->p2p_wdev_mutex);

		wil_mask_irq(wil);

		@@ -1051,6 +1053,7 @@ int __wil_down(struct wil6210_priv *wil)

		wil_p2p_stop_radio_operations(wil);

		mutex_lock(&wil->p2p_wdev_mutex);
		if (wil->scan_request) {
		wil_dbg_misc(wil, "Abort scan_request 0x%p\n",
		wil->scan_request);
		@@ -1058,6 +1061,7 @@ int __wil_down(struct wil6210_priv *wil)
		cfg80211_scan_done(wil->scan_request, true);
		wil->scan_request = NULL;
		}
		mutex_unlock(&wil->p2p_wdev_mutex);

		wil_reset(wil, false);

+1 −1

Original line number	Diff line number	Diff line
		@@ -657,7 +657,7 @@ struct wil6210_priv {

		/* P2P_DEVICE vif */
		struct wireless_dev *p2p_wdev;
		struct mutex p2p_wdev_mutex; /* protect @p2p_wdev */
		struct mutex p2p_wdev_mutex; /* protect @p2p_wdev and @scan_request */
		struct wireless_dev *radio_wdev;

		/* High Access Latency Policy voting */

+2 −2

Original line number	Diff line number	Diff line
		@@ -424,6 +424,7 @@ static void wmi_evt_tx_mgmt(struct wil6210_priv wil, int id, void d, int len)
		static void wmi_evt_scan_complete(struct wil6210_priv *wil, int id,
		void *d, int len)
		{
		mutex_lock(&wil->p2p_wdev_mutex);
		if (wil->scan_request) {
		struct wmi_scan_complete_event *data = d;
		bool aborted = (data->status != WMI_SCAN_SUCCESS);
		@@ -433,14 +434,13 @@ static void wmi_evt_scan_complete(struct wil6210_priv *wil, int id,
		wil->scan_request, aborted);

		del_timer_sync(&wil->scan_timer);
		mutex_lock(&wil->p2p_wdev_mutex);
		cfg80211_scan_done(wil->scan_request, aborted);
		wil->radio_wdev = wil->wdev;
		mutex_unlock(&wil->p2p_wdev_mutex);
		wil->scan_request = NULL;
		} else {
		wil_err(wil, "SCAN_COMPLETE while not scanning\n");
		}
		mutex_unlock(&wil->p2p_wdev_mutex);
		}

		static void wmi_evt_connect(struct wil6210_priv wil, int id, void d, int len)