From: Greg Kroah-Hartman Date: Mon, 29 Oct 2012 17:12:51 +0000 (-0700) Subject: remove queue-3.6/rt2x00-usb-fix-reset-resume.patch X-Git-Tag: v3.0.50~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=224d0f9523f77df843b46c7bd5cebf8ffb85aee4;p=thirdparty%2Fkernel%2Fstable-queue.git remove queue-3.6/rt2x00-usb-fix-reset-resume.patch --- diff --git a/queue-3.6/net-wireless-ipw2200-fix-panic-occurring-in-ipw_handle_promiscuous_tx.patch b/queue-3.6/net-wireless-ipw2200-fix-panic-occurring-in-ipw_handle_promiscuous_tx.patch index c9cf1446db9..ff242fa4829 100644 --- a/queue-3.6/net-wireless-ipw2200-fix-panic-occurring-in-ipw_handle_promiscuous_tx.patch +++ b/queue-3.6/net-wireless-ipw2200-fix-panic-occurring-in-ipw_handle_promiscuous_tx.patch @@ -27,9 +27,13 @@ Signed-off-by: Stanislav Yakovlev Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c -@@ -10472,7 +10472,7 @@ static void ipw_handle_promiscuous_tx(struct ipw_priv *priv, +@@ -10479,7 +10479,7 @@ static void ipw_handle_promiscuous_tx(st } else len = src->len; diff --git a/queue-3.6/rt2x00-usb-fix-reset-resume.patch b/queue-3.6/rt2x00-usb-fix-reset-resume.patch deleted file mode 100644 index 8aad5459d7a..00000000000 --- a/queue-3.6/rt2x00-usb-fix-reset-resume.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 761ce8c41ed20ee3af77f2df527edc3f92e6f3bf Mon Sep 17 00:00:00 2001 -From: Stanislaw Gruszka -Date: Tue, 16 Oct 2012 14:34:12 +0200 -Subject: rt2x00: usb: fix reset resume - -From: Stanislaw Gruszka - -commit 761ce8c41ed20ee3af77f2df527edc3f92e6f3bf upstream. - -Patch fixes warnings like below happened on resume: - -WARNING: at net/mac80211/driver-ops.h:12 check_sdata_in_driver+0x32/0x34() - -Problem is that in __ieee80211_susped() we remove sdata (i.e wlan0 -interface) and then during resume we call usb_unbind_interface() -> -ieee80211_unregister_hw() with sdata removed. - -Patch fixes problem by adding .reset_resume calback, hence we do not -unbind usb device on resume. This callback can be the same as normal -.resume callback, sice we do all needed initalization during interface -start, which is performed on resume [ ieee80211_resume() -> -ieee80211_reconfig() -> rt2x00mac_start() -> rt2x00lib_start ]. - -Resolves: -https://bugzilla.kernel.org/show_bug.cgi?id=48041 - -Reported-by: David Herrmann -Reported-and-tested-by: Stephen Boyd -Signed-off-by: Stanislaw Gruszka -Acked-by: Gertjan van Wingerde -Signed-off-by: John W. Linville -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/wireless/rt2x00/rt2500usb.c | 1 + - drivers/net/wireless/rt2x00/rt2800usb.c | 1 + - drivers/net/wireless/rt2x00/rt73usb.c | 1 + - 3 files changed, 3 insertions(+) - ---- a/drivers/net/wireless/rt2x00/rt2500usb.c -+++ b/drivers/net/wireless/rt2x00/rt2500usb.c -@@ -1989,6 +1989,7 @@ static struct usb_driver rt2500usb_drive - .disconnect = rt2x00usb_disconnect, - .suspend = rt2x00usb_suspend, - .resume = rt2x00usb_resume, -+ .reset_resume = rt2x00usb_resume, - .disable_hub_initiated_lpm = 1, - }; - ---- a/drivers/net/wireless/rt2x00/rt2800usb.c -+++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -1322,6 +1322,7 @@ static struct usb_driver rt2800usb_drive - .disconnect = rt2x00usb_disconnect, - .suspend = rt2x00usb_suspend, - .resume = rt2x00usb_resume, -+ .reset_resume = rt2x00usb_resume, - .disable_hub_initiated_lpm = 1, - }; - ---- a/drivers/net/wireless/rt2x00/rt73usb.c -+++ b/drivers/net/wireless/rt2x00/rt73usb.c -@@ -2536,6 +2536,7 @@ static struct usb_driver rt73usb_driver - .disconnect = rt2x00usb_disconnect, - .suspend = rt2x00usb_suspend, - .resume = rt2x00usb_resume, -+ .reset_resume = rt2x00usb_resume, - .disable_hub_initiated_lpm = 1, - }; - diff --git a/queue-3.6/series b/queue-3.6/series index b7eb09c520f..fbfb6e56f4c 100644 --- a/queue-3.6/series +++ b/queue-3.6/series @@ -82,7 +82,6 @@ b43-fix-oops-on-unload-when-firmware-not-found.patch tilegx-fix-some-issues-in-the-sw-tso-support.patch bluetooth-smp-fix-setting-unknown-auth_req-bits.patch qmi_wwan-cdc_ether-move-novatel-551-and-e362-to-qmi_wwan.patch -rt2x00-usb-fix-reset-resume.patch freezer-exec-should-clear-pf_nofreeze-along-with-pf_kthread.patch dmaengine-sirf-fix-a-typo-in-dma_prep_interleaved.patch dmaengine-sirf-fix-a-typo-in-moving-running-dma_desc-to-active-queue.patch