[67/74] backports: adjust timer functions

Commit Message

Johannes Berg May 24, 2024, 5:08 p.m. UTC

From: Gregory Greenman <[e-mail]>

Partially adjust to commit
292a089d78d3 ("treewide: Convert del_timer*() to timer_shutdown*()")

Signed-off-by: Gregory Greenman <[e-mail]>
Signed-off-by: Johannes Berg <[e-mail]>
---
 patches/0110-timers.patch | 48 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 patches/0110-timers.patch

Patch

diff --git a/patches/0110-timers.patch b/patches/0110-timers.patch
new file mode 100644
index 000000000000..70f98e5bdf00
--- /dev/null
+++ b/patches/0110-timers.patch
@@ -0,0 +1,48 @@ 
+diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
+index 48e7376a5fea..0781dd07a377 100644
+--- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
++++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
+@@ -371,7 +371,11 @@ void iwl_dbg_tlv_del_timers(struct iwl_trans *trans)
+ 	struct iwl_dbg_tlv_timer_node *node, *tmp;
+ 
+ 	list_for_each_entry_safe(node, tmp, timer_list, list) {
++#if LINUX_VERSION_IS_GEQ(6,2,1)
+ 		timer_shutdown_sync(&node->timer);
++#else
++		del_timer_sync(&node->timer);
++#endif
+ 		list_del(&node->list);
+ 		kfree(node);
+ 	}
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+index 69634fb82a9b..00125b8143a8 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+@@ -2835,7 +2835,11 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
+ 
+ 		/* synchronize all rx queues so we can safely delete */
+ 		iwl_mvm_free_reorder(mvm, baid_data);
++#if LINUX_VERSION_IS_GEQ(6,2,1)
+ 		timer_shutdown_sync(&baid_data->session_timer);
++#else
++		del_timer_sync(&baid_data->session_timer);
++#endif
+ 		RCU_INIT_POINTER(mvm->baid_map[baid], NULL);
+ 		kfree_rcu(baid_data, rcu_head);
+ 		IWL_DEBUG_HT(mvm, "BAID %d is free\n", baid);
+diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
+index 3b81e6df3f34..29c0dbd1b6c2 100644
+--- a/net/mac80211/mesh_pathtbl.c
++++ b/net/mac80211/mesh_pathtbl.c
+@@ -512,7 +512,11 @@ static void mesh_path_free_rcu(struct mesh_table *tbl,
+ 	mpath->flags |= MESH_PATH_RESOLVING | MESH_PATH_DELETED;
+ 	mesh_gate_del(tbl, mpath);
+ 	spin_unlock_bh(&mpath->state_lock);
++#if LINUX_VERSION_IS_GEQ(6,2,1)
+ 	timer_shutdown_sync(&mpath->timer);
++#else
++	del_timer_sync(&mpath->timer);
++#endif
+ 	atomic_dec(&sdata->u.mesh.mpaths);
+ 	atomic_dec(&tbl->entries);
+ 	mesh_path_flush_pending(mpath);