Skip to contentSkip to conversation

Patch "rt2x00: avoid introducing a USB dependency in the rt2x00lib module" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jun 27, 2017

Subsystems (2)
Stable branch Ralink RT2X00 wireless LAN driver
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

rt2x00: avoid introducing a USB dependency in the rt2x00lib module

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
rt2x00-avoid-introducing-a-usb-dependency-in-the-rt2x00lib-module.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 6232c17438ed01f43665197db5a98a4a4f77ef47 Mon Sep 17 00:00:00 2001

From: Stanislaw Gruszka <[email protected]>
Date: Thu, 2 Feb 2017 10:57:40 +0100
Subject: rt2x00: avoid introducing a USB dependency in the rt2x00lib module

From: Stanislaw Gruszka <[email protected]>

commit 6232c17438ed01f43665197db5a98a4a4f77ef47 upstream.

As reported by Felix:

Though protected by an ifdef, introducing an usb symbol dependency in the rt2x00lib module is a major inconvenience for distributions that package kernel modules split into individual packages.

Get rid of this unnecessary dependency by calling the usb related function from a more suitable place.

Cc Vishal Thanki <[email protected]>
Reported-by Felix Fietkau <[email protected]>
Fixes 8b4c0009313f ("rt2x00usb: Use usb anchor to manage URB")
Signed-off-by Stanislaw Gruszka <[email protected]>
Signed-off-by Kalle Valo <[email protected]>
Signed-off-by Amit Pundir <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/net/wireless/ralink/rt2x00/rt2x00dev.c |   23 ++++++++---------------
 drivers/net/wireless/ralink/rt2x00/rt2x00usb.c |    5 +++++
 2 files changed, 13 insertions(+), 15 deletions(-)
drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +8 -15
@@ -1422,21 +1422,6 @@ void rt2x00lib_remove_dev(struct rt2x00_
 	cancel_work_sync(&rt2x00dev->intf_work);
 	cancel_delayed_work_sync(&rt2x00dev->autowakeup_work);
 	cancel_work_sync(&rt2x00dev->sleep_work);
-#if IS_ENABLED(CONFIG_RT2X00_LIB_USB)
-	if (rt2x00_is_usb(rt2x00dev)) {
-		usb_kill_anchored_urbs(rt2x00dev->anchor);
-		hrtimer_cancel(&rt2x00dev->txstatus_timer);
-		cancel_work_sync(&rt2x00dev->rxdone_work);
-		cancel_work_sync(&rt2x00dev->txdone_work);
-	}
-#endif
-	if (rt2x00dev->workqueue)
-		destroy_workqueue(rt2x00dev->workqueue);
-
-	/*
-	 * Free the tx status fifo.
-	 */
-	kfifo_free(&rt2x00dev->txstatus_fifo);
 
 	/*
 	 * Kill the tx status tasklet.

@@ -1452,6 +1437,14 @@ void rt2x00lib_remove_dev(struct rt2x00_
 	 */
 	rt2x00lib_uninitialize(rt2x00dev);
 
+	if (rt2x00dev->workqueue)
+		destroy_workqueue(rt2x00dev->workqueue);
+
+	/*
+	 * Free the tx status fifo.
+	 */
+	kfifo_free(&rt2x00dev->txstatus_fifo);
+
 	/*
 	 * Free extra components
 	 */
drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +5 -0
@@ -740,6 +740,11 @@ void rt2x00usb_uninitialize(struct rt2x0
 {
 	struct data_queue *queue;
 
+	usb_kill_anchored_urbs(rt2x00dev->anchor);
+	hrtimer_cancel(&rt2x00dev->txstatus_timer);
+	cancel_work_sync(&rt2x00dev->rxdone_work);
+	cancel_work_sync(&rt2x00dev->txdone_work);
+
 	queue_for_each(rt2x00dev, queue)
 		rt2x00usb_free_entries(queue);
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/rt2x00-avoid-introducing-a-usb-dependency-in-the-rt2x00lib-module.patch