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

Commit bd69cddc authored by Ganapathi Bhat's avatar Ganapathi Bhat Committed by Kalle Valo
Browse files

mwifiex: replace netif_carrier_on/off by netif_device_attach/dettach 



Driver is doing netif_carrier_off during suspend, which will set
the IFF_LOWER_UP flag to 0. As a result certain applications
will think this as a real carrier down and behave accordingly.
This will cause issues like loss of IP address, for example. To
fix this use netif_device_dettach during suspend.

Fixes: 0026b32d ('mwifiex: fix Tx timeout issue during suspend test')

Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarGanapathi Bhat <gbhat@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 80a88ecf

drivers/net/wireless/marvell/mwifiex/cfg80211.c

+4 −10
Original line number Diff line number Diff line
@@ -3391,11 +3391,8 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy, 


	for (i = 0; i < adapter->priv_num; i++) {

		priv = adapter->priv[i];

		if (priv && priv->netdev) {

			mwifiex_stop_net_dev_queue(priv->netdev, adapter);

			if (netif_carrier_ok(priv->netdev))

				netif_carrier_off(priv->netdev);

		}

		if (priv && priv->netdev)

			netif_device_detach(priv->netdev);

	}



	for (i = 0; i < retry_num; i++) {
@@ -3466,11 +3463,8 @@ static int mwifiex_cfg80211_resume(struct wiphy *wiphy) 


	for (i = 0; i < adapter->priv_num; i++) {

		priv = adapter->priv[i];

		if (priv && priv->netdev) {

			if (!netif_carrier_ok(priv->netdev))

				netif_carrier_on(priv->netdev);

			mwifiex_wake_up_net_dev_queue(priv->netdev, adapter);

		}

		if (priv && priv->netdev)

			netif_device_attach(priv->netdev);

	}



	if (!wiphy->wowlan_config)