diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-07 10:35:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-07 10:35:19 -0700 |
| commit | 8a0718ff46ba217c51598d06c9f31705c047c6c0 (patch) | |
| tree | c912e7b1c3ff2604e5e11abf02ee6905666660db | |
| parent | c6c284cdef73050a60b570e42a7e8f3aa71c17cc (diff) | |
| download | stable-queue-8a0718ff46ba217c51598d06c9f31705c047c6c0.tar.gz | |
.39 patches
| -rw-r--r-- | queue-2.6.39/series | 1 | ||||
| -rw-r--r-- | queue-2.6.39/usbnet-cdc_ncm-add-missing-.reset_resume-hook.patch | 39 |
2 files changed, 40 insertions, 0 deletions
diff --git a/queue-2.6.39/series b/queue-2.6.39/series index 647dffc783..8f487eefd9 100644 --- a/queue-2.6.39/series +++ b/queue-2.6.39/series @@ -31,3 +31,4 @@ powerpc-fix-32-bit-smp-build.patch asus-wmi-remove-__init-from-asus_wmi_platform_init.patch nl80211-fix-check-for-valid-ssid-size-in-scan-operations.patch block-export-blk_-get-put-_queue.patch +usbnet-cdc_ncm-add-missing-.reset_resume-hook.patch diff --git a/queue-2.6.39/usbnet-cdc_ncm-add-missing-.reset_resume-hook.patch b/queue-2.6.39/usbnet-cdc_ncm-add-missing-.reset_resume-hook.patch new file mode 100644 index 0000000000..deb7707045 --- /dev/null +++ b/queue-2.6.39/usbnet-cdc_ncm-add-missing-.reset_resume-hook.patch @@ -0,0 +1,39 @@ +From 85e3c65fa3a1d0542c181510a950a2be7733ff29 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher <metze@samba.org> +Date: Wed, 1 Jun 2011 02:01:41 +0000 +Subject: usbnet/cdc_ncm: add missing .reset_resume hook + +From: Stefan Metzmacher <metze@samba.org> + +commit 85e3c65fa3a1d0542c181510a950a2be7733ff29 upstream. + +This avoids messages like this after suspend: + + cdc_ncm 2-1.4:1.6: no reset_resume for driver cdc_ncm? + cdc_ncm 2-1.4:1.7: no reset_resume for driver cdc_ncm? + cdc_ncm 2-1.4:1.6: usb0: unregister 'cdc_ncm' usb-0000:00:1d.0-1.4, CDC NCM + +This is important for the Ericsson F5521gw GSM/UMTS modem. +Otherwise modemmanager looses the fact that the cdc_ncm and cdc_acm devices +belong together. + +The cdc_ether module does the same. + +Signed-off-by: Stefan Metzmacher <metze@samba.org> +Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/net/usb/cdc_ncm.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/usb/cdc_ncm.c ++++ b/drivers/net/usb/cdc_ncm.c +@@ -1254,6 +1254,7 @@ static struct usb_driver cdc_ncm_driver + .disconnect = cdc_ncm_disconnect, + .suspend = usbnet_suspend, + .resume = usbnet_resume, ++ .reset_resume = usbnet_resume, + .supports_autosuspend = 1, + }; + |