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

Commit 54f00849 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by Kalle Valo
Browse files

mwifiex: Empty Tx queue during suspend 



In cfg80211 suspend handler, stop the netif queue and
wait until all the Tx queues become empty. Start the
queues in resume handler.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 107b8713

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

+25 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "cfg80211.h"

#include "main.h"

#include "11n.h"

#include "wmm.h"



static char *reg_alpha2;

module_param(reg_alpha2, charp, 0);
@@ -3259,7 +3260,7 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy, 
{

	struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);

	struct mwifiex_ds_hs_cfg hs_cfg;

	int i, ret = 0;

	int i, ret = 0, retry_num = 10;

	struct mwifiex_private *priv;



	for (i = 0; i < adapter->priv_num; i++) {
@@ -3269,6 +3270,21 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy, 


	mwifiex_cancel_all_pending_cmd(adapter);



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

		priv = adapter->priv[i];

		if (priv && priv->netdev)

			mwifiex_stop_net_dev_queue(priv->netdev, adapter);

	}



	for (i = 0; i < retry_num; i++) {

		if (!mwifiex_wmm_lists_empty(adapter) ||

		    !mwifiex_bypass_txlist_empty(adapter) ||

		    !skb_queue_empty(&adapter->tx_data_q))

			usleep_range(10000, 15000);

		else

			break;

	}



	if (!wowlan) {

		mwifiex_dbg(adapter, ERROR,

			    "None of the WOWLAN triggers enabled\n");
@@ -3321,12 +3337,18 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy, 
static int mwifiex_cfg80211_resume(struct wiphy *wiphy)

{

	struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);

	struct mwifiex_private *priv =

		mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);

	struct mwifiex_private *priv;

	struct mwifiex_ds_wakeup_reason wakeup_reason;

	struct cfg80211_wowlan_wakeup wakeup_report;

	int i;



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

		priv = adapter->priv[i];

		if (priv && priv->netdev)

			mwifiex_wake_up_net_dev_queue(priv->netdev, adapter);

	}



	priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);

	mwifiex_get_wakeup_reason(priv, HostCmd_ACT_GEN_GET, MWIFIEX_SYNC_CMD,

				  &wakeup_reason);

	memset(&wakeup_report, 0, sizeof(struct cfg80211_wowlan_wakeup));