* [PATCH] rt2x00: avoid introducing a USB dependency in the rt2x00lib module
@ 2017-01-27 8:34 Felix Fietkau
2017-01-27 12:10 ` Stanislaw Gruszka
0 siblings, 1 reply; 3+ messages in thread
From: Felix Fietkau @ 2017-01-27 8:34 UTC (permalink / raw)
To: linux-wireless; +Cc: kvalo, sgruszka, vishalthanki
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
Fixes: 8b4c0009313f ("rt2x00usb: Use usb anchor to manage URB")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 3 ---
drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 2 ++
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
index 8fcbc8dc94c1..75f838405344 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
@@ -1436,14 +1436,11 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
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);
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
index 838ca58d2dd6..be5beaacf4f0 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
@@ -858,11 +858,13 @@ void rt2x00usb_disconnect(struct usb_interface *usb_intf)
{
struct ieee80211_hw *hw = usb_get_intfdata(usb_intf);
struct rt2x00_dev *rt2x00dev = hw->priv;
+ struct usb_anchor *anchor = rt2x00dev->anchor;
/*
* Free all allocated data.
*/
rt2x00lib_remove_dev(rt2x00dev);
+ usb_kill_anchored_urbs(anchor);
rt2x00usb_free_reg(rt2x00dev);
ieee80211_free_hw(hw);
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] rt2x00: avoid introducing a USB dependency in the rt2x00lib module
2017-01-27 8:34 [PATCH] rt2x00: avoid introducing a USB dependency in the rt2x00lib module Felix Fietkau
@ 2017-01-27 12:10 ` Stanislaw Gruszka
2017-01-27 12:23 ` Felix Fietkau
0 siblings, 1 reply; 3+ messages in thread
From: Stanislaw Gruszka @ 2017-01-27 12:10 UTC (permalink / raw)
To: Felix Fietkau; +Cc: linux-wireless, kvalo, vishalthanki
Hi
On Fri, Jan 27, 2017 at 09:34:26AM +0100, Felix Fietkau wrote:
> 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
<snip>
> rt2x00lib_remove_dev(rt2x00dev);
> + usb_kill_anchored_urbs(anchor);
At this point killing urb's is too late, because we already free
structures that are used by urb->callback.
Below patch should solve the problem and not break shutdown sequence:
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
index eb7b714..9235e03 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
@@ -1441,21 +1441,6 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
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.
@@ -1471,6 +1456,14 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
*/
rt2x00lib_uninitialize(rt2x00dev);
+ if (rt2x00dev->workqueue)
+ destroy_workqueue(rt2x00dev->workqueue);
+
+ /*
+ * Free the tx status fifo.
+ */
+ kfifo_free(&rt2x00dev->txstatus_fifo);
+
/*
* Free extra components
*/
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
index 6005e14..a0a866e 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
@@ -744,6 +744,11 @@ void rt2x00usb_uninitialize(struct rt2x00_dev *rt2x00dev)
{
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);
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] rt2x00: avoid introducing a USB dependency in the rt2x00lib module
2017-01-27 12:10 ` Stanislaw Gruszka
@ 2017-01-27 12:23 ` Felix Fietkau
0 siblings, 0 replies; 3+ messages in thread
From: Felix Fietkau @ 2017-01-27 12:23 UTC (permalink / raw)
To: Stanislaw Gruszka; +Cc: linux-wireless, kvalo, vishalthanki
On 2017-01-27 13:10, Stanislaw Gruszka wrote:
> Hi
>
> On Fri, Jan 27, 2017 at 09:34:26AM +0100, Felix Fietkau wrote:
>> 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
> <snip>
>> rt2x00lib_remove_dev(rt2x00dev);
>> + usb_kill_anchored_urbs(anchor);
>
> At this point killing urb's is too late, because we already free
> structures that are used by urb->callback.
>
> Below patch should solve the problem and not break shutdown sequence:
>
> diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
> index eb7b714..9235e03 100644
> --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
> +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
> @@ -1441,21 +1441,6 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
> 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.
> @@ -1471,6 +1456,14 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
> */
> rt2x00lib_uninitialize(rt2x00dev);
>
> + if (rt2x00dev->workqueue)
> + destroy_workqueue(rt2x00dev->workqueue);
> +
> + /*
> + * Free the tx status fifo.
> + */
> + kfifo_free(&rt2x00dev->txstatus_fifo);
> +
> /*
> * Free extra components
> */
> diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
> index 6005e14..a0a866e 100644
> --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
> +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
> @@ -744,6 +744,11 @@ void rt2x00usb_uninitialize(struct rt2x00_dev *rt2x00dev)
> {
> 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);
> +
Looks good to me, please submit that.
- Felix
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-27 12:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-27 8:34 [PATCH] rt2x00: avoid introducing a USB dependency in the rt2x00lib module Felix Fietkau
2017-01-27 12:10 ` Stanislaw Gruszka
2017-01-27 12:23 ` Felix Fietkau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).