Skip to contentSkip to conversation

rt2x00dev: cancel all work on disconnect

PATCH In review Pavel Roskin 3 participants 3 messages Jul 29, 2009 – Jul 30, 2009 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rt2x00dev: cancel all work on disconnect

---
 drivers/net/wireless/rt2x00/rt2x00dev.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
drivers/net/wireless/rt2x00/rt2x00dev.c +7 -0
index 658a63b..66b303b 100644
@@ -888,6 +888,13 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
 	clear_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags);
 
 	/*
+	 * Cancel all work.
+	 */
+	rt2x00link_stop_tuner(rt2x00dev);
+	cancel_work_sync(&rt2x00dev->filter_work);
+	cancel_work_sync(&rt2x00dev->intf_work);
+
+	/*
 	 * Disable radio.
 	 */
 	rt2x00lib_disable_radio(rt2x00dev);
#1 lore raw

Hi,

I assume fixes the bug Michael reported on Linux-wireless yesterday? The patch looks good, but I have some minor modification request:

Quoted 10 lines · Pavel Roskin
---
 drivers/net/wireless/rt2x00/rt2x00dev.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
drivers/net/wireless/rt2x00/rt2x00dev.c +0 -0
index 658a63b..66b303b 100644

drivers/net/wireless/rt2x00/rt2x00dev.c void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) · line 893

Quoted 6 lines
drivers/net/wireless/rt2x00/rt2x00dev.c +3 -0
@@ -888,6 +888,13 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
 	clear_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags);
 
 	/*
+	 * Cancel all work.
+	 */
+	rt2x00link_stop_tuner(rt2x00dev);

This one isn't needed. rt2x00lib_disable_radio() is doing this.

drivers/net/wireless/rt2x00/rt2x00dev.c void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) · line 895

Quoted 2 lines
drivers/net/wireless/rt2x00/rt2x00dev.c +2 -0
+	cancel_work_sync(&rt2x00dev->filter_work);
+	cancel_work_sync(&rt2x00dev->intf_work);

Could you move these 2 until after the call to rt2x00lib_disable_radio()?

drivers/net/wireless/rt2x00/rt2x00dev.c void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) · line 900

Quoted 4 lines
drivers/net/wireless/rt2x00/rt2x00dev.c +1 -0
+	/*
 	 * Disable radio.
 	 */
 	rt2x00lib_disable_radio(rt2x00dev);

Thanks,

Ivo

#2 lore raw
Quoted 3 lines · On Thursday 30 July 2009 20:45:15 Ivo van Doorn wrote:

Hi,

I assume fixes the bug Michael reported on Linux-wireless yesterday?

I didn't test that, yet, but the patch looks sane anyway.

Quoted 37 lines

The patch looks good, but I have some minor modification request:

Quoted 10 lines · Pavel Roskin
---
 drivers/net/wireless/rt2x00/rt2x00dev.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
drivers/net/wireless/rt2x00/rt2x00dev.c +0 -0
index 658a63b..66b303b 100644

drivers/net/wireless/rt2x00/rt2x00dev.c void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) · line 893

Quoted 6 lines
drivers/net/wireless/rt2x00/rt2x00dev.c +3 -0
@@ -888,6 +888,13 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
 	clear_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags);
 
 	/*
+	 * Cancel all work.
+	 */
+	rt2x00link_stop_tuner(rt2x00dev);

This one isn't needed. rt2x00lib_disable_radio() is doing this.

drivers/net/wireless/rt2x00/rt2x00dev.c void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) · line 895

Quoted 2 lines
drivers/net/wireless/rt2x00/rt2x00dev.c +2 -0
+	cancel_work_sync(&rt2x00dev->filter_work);
+	cancel_work_sync(&rt2x00dev->intf_work);

Could you move these 2 until after the call to rt2x00lib_disable_radio()?

drivers/net/wireless/rt2x00/rt2x00dev.c void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) · line 900

Quoted 4 lines
drivers/net/wireless/rt2x00/rt2x00dev.c +1 -0
+	/*
 	 * Disable radio.
 	 */
 	rt2x00lib_disable_radio(rt2x00dev);

Thanks,

Ivo

Signature · 1 line
Greetings, Michael.