package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch

   1 From 6232c17438ed01f43665197db5a98a4a4f77ef47 Mon Sep 17 00:00:00 2001
   2 From: Stanislaw Gruszka <sgruszka@redhat.com>
   3 Date: Thu, 2 Feb 2017 10:57:40 +0100
   4 Subject: [PATCH 01/19] rt2x00: avoid introducing a USB dependency in the
   5  rt2x00lib module
   6
   7 As reported by Felix:
   8
   9 Though protected by an ifdef, introducing an usb symbol dependency in
  10 the rt2x00lib module is a major inconvenience for distributions that
  11 package kernel modules split into individual packages.
  12
  13 Get rid of this unnecessary dependency by calling the usb related
  14 function from a more suitable place.
  15
  16 Cc: Vishal Thanki <vishalthanki@gmail.com>
  17 Reported-by: Felix Fietkau <nbd@nbd.name>
  18 Fixes: 8b4c0009313f ("rt2x00usb: Use usb anchor to manage URB")
  19 Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
  20 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  21 ---
  22  drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 23 ++++++++---------------
  23  drivers/net/wireless/ralink/rt2x00/rt2x00usb.c |  5 +++++
  24  2 files changed, 13 insertions(+), 15 deletions(-)
  25
  26 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
  27 index 8fcbc8dc94c1..4b08007f93f7 100644
  28 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
  29 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
  30 @@ -1436,21 +1436,6 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
  31         cancel_work_sync(&rt2x00dev->intf_work);
  32         cancel_delayed_work_sync(&rt2x00dev->autowakeup_work);
  33         cancel_work_sync(&rt2x00dev->sleep_work);
  34 -#if IS_ENABLED(CPTCFG_RT2X00_LIB_USB)
  35 -       if (rt2x00_is_usb(rt2x00dev)) {
  36 -               usb_kill_anchored_urbs(rt2x00dev->anchor);
  37 -               hrtimer_cancel(&rt2x00dev->txstatus_timer);
  38 -               cancel_work_sync(&rt2x00dev->rxdone_work);
  39 -               cancel_work_sync(&rt2x00dev->txdone_work);
  40 -       }
  41 -#endif
  42 -       if (rt2x00dev->workqueue)
  43 -               destroy_workqueue(rt2x00dev->workqueue);
  44 -
  45 -       /*
  46 -        * Free the tx status fifo.
  47 -        */
  48 -       kfifo_free(&rt2x00dev->txstatus_fifo);
  49
  50         /*
  51          * Kill the tx status tasklet.
  52 @@ -1466,6 +1451,14 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
  53          */
  54         rt2x00lib_uninitialize(rt2x00dev);
  55
  56 +       if (rt2x00dev->workqueue)
  57 +               destroy_workqueue(rt2x00dev->workqueue);
  58 +
  59 +       /*
  60 +        * Free the tx status fifo.
  61 +        */
  62 +       kfifo_free(&rt2x00dev->txstatus_fifo);
  63 +
  64         /*
  65          * Free extra components
  66          */
  67 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
  68 index 838ca58d2dd6..5a2bf9f63cd7 100644
  69 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
  70 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
  71 @@ -744,6 +744,11 @@ void rt2x00usb_uninitialize(struct rt2x00_dev *rt2x00dev)
  72  {
  73         struct data_queue *queue;
  74
  75 +       usb_kill_anchored_urbs(rt2x00dev->anchor);
  76 +       hrtimer_cancel(&rt2x00dev->txstatus_timer);
  77 +       cancel_work_sync(&rt2x00dev->rxdone_work);
  78 +       cancel_work_sync(&rt2x00dev->txdone_work);
  79 +
  80         queue_for_each(rt2x00dev, queue)
  81                 rt2x00usb_free_entries(queue);
  82  }
  83 --
  84 2.12.1
  85