mirror of
https://github.com/shenmintao/aic8800d80.git
synced 2026-09-26 17:44:16 +00:00
rename del_timer() to timer_delete() and del_timer_sync() to timer_delete_sync()
This commit is contained in:
@@ -1428,7 +1428,7 @@ int reord_flush_tid(struct aicwf_rx_priv *rx_priv, struct sk_buff *skb, u8 tid)
|
||||
preorder_ctrl->enable = false;
|
||||
spin_unlock_irqrestore(&preorder_ctrl->reord_list_lock, flags);
|
||||
if (timer_pending(&preorder_ctrl->reord_timer))
|
||||
ret = del_timer_sync(&preorder_ctrl->reord_timer);
|
||||
ret = timer_delete_sync(&preorder_ctrl->reord_timer);
|
||||
cancel_work_sync(&preorder_ctrl->reord_timer_work);
|
||||
|
||||
return 0;
|
||||
@@ -1454,7 +1454,7 @@ void reord_deinit_sta(struct aicwf_rx_priv* rx_priv, struct reord_ctrl_info *reo
|
||||
if(preorder_ctrl->enable){
|
||||
preorder_ctrl->enable = false;
|
||||
if (timer_pending(&preorder_ctrl->reord_timer)) {
|
||||
ret = del_timer_sync(&preorder_ctrl->reord_timer);
|
||||
ret = timer_delete_sync(&preorder_ctrl->reord_timer);
|
||||
}
|
||||
cancel_work_sync(&preorder_ctrl->reord_timer_work);
|
||||
}
|
||||
@@ -1833,7 +1833,7 @@ int reord_process_unit(struct aicwf_rx_priv *rx_priv, struct sk_buff *skb, u16 s
|
||||
}
|
||||
} else {
|
||||
if(timer_pending(&preorder_ctrl->reord_timer)) {
|
||||
ret = del_timer(&preorder_ctrl->reord_timer);
|
||||
ret = timer_delete(&preorder_ctrl->reord_timer);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user