Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b2a4c2d authored Aug 08, 2017 by Hamad Kadmany Committed by Kalle Valo Aug 08, 2017

wil6210: fix interface-up check



While wil_open is executed, any call to netif_running
would return a success. In case there are failures
within wil_open, should not treat the device as if it
is already opened in relevant functions (like FW recovery
and runtime suspend check).

Fix that by checking the device up flag instead.

Signed-off-by: Hamad Kadmany <qca_hkadmany@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

parent d1fbf075

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -394,10 +394,11 @@ static void wil_fw_error_worker(struct work_struct *work)
		struct wil6210_priv *wil = container_of(work, struct wil6210_priv,
		fw_error_worker);
		struct wireless_dev *wdev = wil->wdev;
		struct net_device *ndev = wil_to_ndev(wil);

		wil_dbg_misc(wil, "fw error worker\n");

		if (!netif_running(wil_to_ndev(wil))) {
		if (!(ndev->flags & IFF_UP)) {
		wil_info(wil, "No recovery - interface is down\n");
		return;
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -21,10 +21,11 @@ int wil_can_suspend(struct wil6210_priv *wil, bool is_runtime)
		{
		int rc = 0;
		struct wireless_dev *wdev = wil->wdev;
		struct net_device *ndev = wil_to_ndev(wil);

		wil_dbg_pm(wil, "can_suspend: %s\n", is_runtime ? "runtime" : "system");

		if (!netif_running(wil_to_ndev(wil))) {
		if (!(ndev->flags & IFF_UP)) {
		/* can always sleep when down */
		wil_dbg_pm(wil, "Interface is down\n");
		goto out;