Skip to contentSkip to conversation

mac80211: stop plink timer only on mesh interfaces

PATCH Applied Thomas Pedersen 3 participants 3 messages Feb 4, 2013 – Feb 5, 2013 mac80211

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mac80211: stop plink timer only on mesh interfaces

Since mesh_plink_quiesce() would unconditionally delete the plink timer, and the timer initialization was recently moved into the mesh code path, suspending with a non-mesh interface now causes a crash. Fix this by only deleting the plink timer for mesh interfaces.

---

Hi Emmanuel,

Will you please test this patch?

 net/mac80211/mesh_plink.c |    3 +++
 1 file changed, 3 insertions(+)
net/mac80211/mesh_plink.c +3 -0
index 81e6126..1f40c4a 100644
@@ -528,6 +528,9 @@ static void mesh_plink_timer(unsigned long data)
 #ifdef CONFIG_PM
 void mesh_plink_quiesce(struct sta_info *sta)
 {
+	if (!ieee80211_vif_is_mesh(&sta->sdata->vif))
+		return;
+
 	if (del_timer_sync(&sta->plink_timer))
 		sta->plink_timer_was_running = true;
 }
Signature · 1 line
1.7.10.4
Tested-by on v1 1/1
#1 lore raw
Quoted 32 lines

Since mesh_plink_quiesce() would unconditionally delete the plink timer, and the timer initialization was recently moved into the mesh code path, suspending with a non-mesh interface now causes a crash. Fix this by only deleting the plink timer for mesh interfaces.

---

Hi Emmanuel,

Will you please test this patch?

 net/mac80211/mesh_plink.c |    3 +++
 1 file changed, 3 insertions(+)
net/mac80211/mesh_plink.c +3 -1
index 81e6126..1f40c4a 100644
@@ -528,6 +528,9 @@ static void mesh_plink_timer(unsigned long data)
 #ifdef CONFIG_PM
 void mesh_plink_quiesce(struct sta_info *sta)
 {
+	if (!ieee80211_vif_is_mesh(&sta->sdata->vif))
+		return;
+
 	if (del_timer_sync(&sta->plink_timer))
 		sta->plink_timer_was_running = true;
 }
--
Quoted 1 line

1.7.10.4

---------------------------------------------------------------------
A member of the Intel Corporation group of companies

This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

maintainer Applied
#2 lore raw
In reply to Thomas Pedersen
Quoted 5 lines · Thomas Pedersen

Since mesh_plink_quiesce() would unconditionally delete the plink timer, and the timer initialization was recently moved into the mesh code path, suspending with a non-mesh interface now causes a crash. Fix this by only deleting the plink timer for mesh interfaces.

Applied, thanks.

johannes