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

Commit 629873f2 authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville
Browse files

mwifiex: use del_timer_sync instead of del_timer 



Use SMP safe del_timer_sync instead of del_timer for cancelling
timers.

Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7b4f663e

drivers/net/wireless/mwifiex/11n_rxreorder.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ mwifiex_del_rx_reorder_entry(struct mwifiex_private *priv, 
	mwifiex_11n_dispatch_pkt(priv, tbl, (tbl->start_win + tbl->win_size) &

					    (MAX_TID_VALUE - 1));



	del_timer(&tbl->timer_context.timer);

	del_timer_sync(&tbl->timer_context.timer);



	spin_lock_irqsave(&priv->rx_reorder_tbl_lock, flags);

	list_del(&tbl->list);

drivers/net/wireless/mwifiex/cmdevt.c

+1 −1
Original line number Diff line number Diff line
@@ -786,7 +786,7 @@ int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter) 
	unsigned long flags;



	/* Now we got response from FW, cancel the command timer */

	del_timer(&adapter->cmd_timer);

	del_timer_sync(&adapter->cmd_timer);



	if (!adapter->curr_cmd || !adapter->curr_cmd->resp_skb) {

		resp = (struct host_cmd_ds_command *) adapter->upld_buf;

drivers/net/wireless/mwifiex/init.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter) 
	/* cancel current command */

	if (adapter->curr_cmd) {

		dev_warn(adapter->dev, "curr_cmd is still in processing\n");

		del_timer(&adapter->cmd_timer);

		del_timer_sync(&adapter->cmd_timer);

		mwifiex_recycle_cmd_node(adapter, adapter->curr_cmd);

		adapter->curr_cmd = NULL;

	}

drivers/net/wireless/mwifiex/main.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static int mwifiex_unregister(struct mwifiex_adapter *adapter) 
	if (adapter->if_ops.cleanup_if)

		adapter->if_ops.cleanup_if(adapter);



	del_timer(&adapter->cmd_timer);

	del_timer_sync(&adapter->cmd_timer);



	/* Free private structures */

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