aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-06-10 15:30:31 +0200
committerFelix Fietkau <nbd@nbd.name>2017-06-17 11:51:41 +0200
commit45572fe831f94654af35316a365c51eb8a9cdeb8 (patch)
treea272e99019d5fd64d063ef48594b5f53bee204e1 /package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch
parent189239ade353636f9e2788cd0467bcca97bb9324 (diff)
downloadupstream-45572fe831f94654af35316a365c51eb8a9cdeb8.tar.gz
upstream-45572fe831f94654af35316a365c51eb8a9cdeb8.tar.bz2
upstream-45572fe831f94654af35316a365c51eb8a9cdeb8.zip
mac80211: refresh patches
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch')
-rw-r--r--package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch13
1 files changed, 3 insertions, 10 deletions
diff --git a/package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch b/package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch
index 7e829faef6..cf551fde02 100644
--- a/package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch
+++ b/package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch
@@ -23,11 +23,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 5 +++++
2 files changed, 13 insertions(+), 15 deletions(-)
-diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
-index 8fcbc8dc94c1..4b08007f93f7 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
-@@ -1436,21 +1436,6 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
+@@ -1436,21 +1436,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);
@@ -49,7 +47,7 @@ index 8fcbc8dc94c1..4b08007f93f7 100644
/*
* Kill the tx status tasklet.
-@@ -1466,6 +1451,14 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
+@@ -1466,6 +1451,14 @@ void rt2x00lib_remove_dev(struct rt2x00_
*/
rt2x00lib_uninitialize(rt2x00dev);
@@ -64,11 +62,9 @@ index 8fcbc8dc94c1..4b08007f93f7 100644
/*
* Free extra components
*/
-diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
-index 838ca58d2dd6..5a2bf9f63cd7 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)
+@@ -744,6 +744,11 @@ void rt2x00usb_uninitialize(struct rt2x0
{
struct data_queue *queue;
@@ -80,6 +76,3 @@ index 838ca58d2dd6..5a2bf9f63cd7 100644
queue_for_each(rt2x00dev, queue)
rt2x00usb_free_entries(queue);
}
---
-2.12.1
-