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

Commit 463df471 authored by Brian Norris's avatar Brian Norris Committed by Kalle Valo
Browse files

mwifiex: drop 'add_tail' param from mwifiex_insert_cmd_to_pending_q() 



It's always called with 'true' -- we only determine it 'false' locally
within this function. So drop the parameter.

Also, this should be 'bool' (since we use true/false), not 'u32'.

Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 8395fd9b

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -664,7 +664,7 @@ int mwifiex_send_cmd(struct mwifiex_private *priv, u16 cmd_no, 
	    cmd_no == HostCmd_CMD_802_11_SCAN_EXT) {

	    cmd_no == HostCmd_CMD_802_11_SCAN_EXT) {

		mwifiex_queue_scan_cmd(priv, cmd_node);

		mwifiex_queue_scan_cmd(priv, cmd_node);

	} else {

	} else {

		mwifiex_insert_cmd_to_pending_q(adapter, cmd_node, true);

		mwifiex_insert_cmd_to_pending_q(adapter, cmd_node);

		queue_work(adapter->workqueue, &adapter->main_work);

		queue_work(adapter->workqueue, &adapter->main_work);

		if (cmd_node->wait_q_enabled)

		if (cmd_node->wait_q_enabled)

			ret = mwifiex_wait_queue_complete(adapter, cmd_node);

			ret = mwifiex_wait_queue_complete(adapter, cmd_node);
@@ -682,11 +682,12 @@ int mwifiex_send_cmd(struct mwifiex_private *priv, u16 cmd_no, 
 */

 */

void

void

mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,

mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,

				struct cmd_ctrl_node *cmd_node, u32 add_tail)

				struct cmd_ctrl_node *cmd_node)

{

{

	struct host_cmd_ds_command *host_cmd = NULL;

	struct host_cmd_ds_command *host_cmd = NULL;

	u16 command;

	u16 command;

	unsigned long flags;

	unsigned long flags;

	bool add_tail = true;





	host_cmd = (struct host_cmd_ds_command *) (cmd_node->cmd_skb->data);

	host_cmd = (struct host_cmd_ds_command *) (cmd_node->cmd_skb->data);

	if (!host_cmd) {

	if (!host_cmd) {

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -1088,8 +1088,7 @@ void mwifiex_recycle_cmd_node(struct mwifiex_adapter *adapter, 
			      struct cmd_ctrl_node *cmd_node);

			      struct cmd_ctrl_node *cmd_node);





void mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,

void mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,

				     struct cmd_ctrl_node *cmd_node,

				     struct cmd_ctrl_node *cmd_node);

				     u32 addtail);





int mwifiex_exec_next_cmd(struct mwifiex_adapter *adapter);

int mwifiex_exec_next_cmd(struct mwifiex_adapter *adapter);

int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter);

int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter);

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -1534,8 +1534,7 @@ int mwifiex_scan_networks(struct mwifiex_private *priv, 
			list_del(&cmd_node->list);

			list_del(&cmd_node->list);

			spin_unlock_irqrestore(&adapter->scan_pending_q_lock,

			spin_unlock_irqrestore(&adapter->scan_pending_q_lock,

					       flags);

					       flags);

			mwifiex_insert_cmd_to_pending_q(adapter, cmd_node,

			mwifiex_insert_cmd_to_pending_q(adapter, cmd_node);

							true);

			queue_work(adapter->workqueue, &adapter->main_work);

			queue_work(adapter->workqueue, &adapter->main_work);





			/* Perform internal scan synchronously */

			/* Perform internal scan synchronously */
@@ -2033,7 +2032,7 @@ static void mwifiex_check_next_scan_command(struct mwifiex_private *priv) 
					    struct cmd_ctrl_node, list);

					    struct cmd_ctrl_node, list);

		list_del(&cmd_node->list);

		list_del(&cmd_node->list);

		spin_unlock_irqrestore(&adapter->scan_pending_q_lock, flags);

		spin_unlock_irqrestore(&adapter->scan_pending_q_lock, flags);

		mwifiex_insert_cmd_to_pending_q(adapter, cmd_node, true);

		mwifiex_insert_cmd_to_pending_q(adapter, cmd_node);

	}

	}





	return;

	return;