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

Commit a9c790ba authored by Xinming Hu's avatar Xinming Hu Committed by Kalle Valo
Browse files

mwifiex: factor out mwifiex_cancel_scan 



This patch creates common function mwifiex_cancel_scan to remove
duplication of code.

Signed-off-by: default avatarXinming Hu <huxm@marvell.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 4699fc3f

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

+2 −38
Original line number Diff line number Diff line
@@ -1020,8 +1020,6 @@ mwifiex_cancel_all_pending_cmd(struct mwifiex_adapter *adapter) 
{

	struct cmd_ctrl_node *cmd_node = NULL, *tmp_node;

	unsigned long flags, cmd_flags;

	struct mwifiex_private *priv;

	int i;



	spin_lock_irqsave(&adapter->mwifiex_cmd_lock, cmd_flags);

	/* Cancel current cmd */
@@ -1046,23 +1044,7 @@ mwifiex_cancel_all_pending_cmd(struct mwifiex_adapter *adapter) 
	spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, flags);

	spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, cmd_flags);



	mwifiex_cancel_pending_scan_cmd(adapter);



	if (adapter->scan_processing) {

		spin_lock_irqsave(&adapter->mwifiex_cmd_lock, cmd_flags);

		adapter->scan_processing = false;

		spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, cmd_flags);

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

			priv = adapter->priv[i];

			if (!priv)

				continue;

			if (priv->scan_request) {

				mwifiex_dbg(adapter, WARN, "info: aborting scan\n");

				cfg80211_scan_done(priv->scan_request, 1);

				priv->scan_request = NULL;

			}

		}

	}

	mwifiex_cancel_scan(adapter);

}



/*
@@ -1080,8 +1062,6 @@ mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter) 
{

	struct cmd_ctrl_node *cmd_node = NULL;

	unsigned long cmd_flags;

	struct mwifiex_private *priv;

	int i;



	if ((adapter->curr_cmd) &&

	    (adapter->curr_cmd->wait_q_enabled)) {
@@ -1101,23 +1081,7 @@ mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter) 
		mwifiex_recycle_cmd_node(adapter, cmd_node);

	}



	mwifiex_cancel_pending_scan_cmd(adapter);



	if (adapter->scan_processing) {

		spin_lock_irqsave(&adapter->mwifiex_cmd_lock, cmd_flags);

		adapter->scan_processing = false;

		spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, cmd_flags);

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

			priv = adapter->priv[i];

			if (!priv)

				continue;

			if (priv->scan_request) {

				mwifiex_dbg(adapter, WARN, "info: aborting scan\n");

				cfg80211_scan_done(priv->scan_request, 1);

				priv->scan_request = NULL;

			}

		}

	}

	mwifiex_cancel_scan(adapter);

}



/*

drivers/net/wireless/marvell/mwifiex/main.h

+1 −0
Original line number Diff line number Diff line
@@ -1054,6 +1054,7 @@ int mwifiex_free_cmd_buffer(struct mwifiex_adapter *adapter); 
void mwifiex_cancel_all_pending_cmd(struct mwifiex_adapter *adapter);

void mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter);

void mwifiex_cancel_pending_scan_cmd(struct mwifiex_adapter *adapter);

void mwifiex_cancel_scan(struct mwifiex_adapter *adapter);



void mwifiex_recycle_cmd_node(struct mwifiex_adapter *adapter,

			      struct cmd_ctrl_node *cmd_node);

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

+26 −0
Original line number Diff line number Diff line
@@ -2001,6 +2001,32 @@ static void mwifiex_check_next_scan_command(struct mwifiex_private *priv) 
	return;

}



void mwifiex_cancel_scan(struct mwifiex_adapter *adapter)

{

	struct mwifiex_private *priv;

	unsigned long cmd_flags;

	int i;



	mwifiex_cancel_pending_scan_cmd(adapter);



	if (adapter->scan_processing) {

		spin_lock_irqsave(&adapter->mwifiex_cmd_lock, cmd_flags);

		adapter->scan_processing = false;

		spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, cmd_flags);

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

			priv = adapter->priv[i];

			if (!priv)

				continue;

			if (priv->scan_request) {

				mwifiex_dbg(adapter, INFO,

					    "info: aborting scan\n");

				cfg80211_scan_done(priv->scan_request, 1);

				priv->scan_request = NULL;

			}

		}

	}

}



/*

 * This function handles the command response of scan.

 *