14 messages, 5 authors, 2011-06-07 · open the first message on its own page
From: Stefan Metzmacher <metze@samba.org>
Date: 2011-06-01 09:26:18
Hi, I noticed the cdc_ncm module doesn't have a .reset_resume hook, while the cdc_ether module has it. metze -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Stefan Metzmacher <metze@samba.org>
Date: 2011-06-01 09:26:11
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> --- drivers/net/usb/cdc_ncm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index cdd3ae4..3257aaa 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c@@ -1234,6 +1234,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, };
--
1.7.4.1
From: Oliver Neukum <hidden>
Date: 2011-06-01 09:41:40
Am Mittwoch, 1. Juni 2011, 11:13:50 schrieb Stefan Metzmacher:
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.
Yes, it does. Have you tested this with active connections and unconnected? Regards Oliver -- - - - SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstraße 5 90409 Nürnberg Germany - - -
From: "Stefan (metze) Metzmacher" <metze@samba.org>
Date: 2011-06-01 10:03:52
Am 01.06.2011 11:43, schrieb Oliver Neukum:
Am Mittwoch, 1. Juni 2011, 11:13:50 schrieb Stefan Metzmacher:quoted
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.Yes, it does. Have you tested this with active connections and unconnected?
Yes, I've just tested suspend while having an active connection (My original tests where without an active connection). BTW: I'm testing this on top of linux-image-2.6.38-8-generic from ubuntu 11.04. metze
From: Alexey ORISHKO <hidden>
Date: 2011-06-01 10:09:23
-----Original Message----- From: linux-usb-owner@vger.kernel.org [mailto:linux-usb- owner@vger.kernel.org] On Behalf Of Stefan (metze) Metzmacher Sent: Wednesday, June 01, 2011 12:04 PM
Please, change a date in DRIVER_VERSION, so it would be easier to track a version of deployed driver Regards, Alexey
From: Stefan Metzmacher <metze@samba.org>
Date: 2011-06-01 12:02:01
Here comes the patch with the DRIVER_VERSION change. Are there chances to get this also backported in stable kernel. I need it for 2.6.38.x (ubuntu 11.04). metze
From: Stefan Metzmacher <metze@samba.org>
Date: 2011-06-01 12:02:07
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> --- drivers/net/usb/cdc_ncm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index cdd3ae4..f33ca6a 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c@@ -54,7 +54,7 @@ #include <linux/usb/usbnet.h> #include <linux/usb/cdc.h> -#define DRIVER_VERSION "24-May-2011" +#define DRIVER_VERSION "01-June-2011" /* CDC NCM subclass 3.2.1 */ #define USB_CDC_NCM_NDP16_LENGTH_MIN 0x10
@@ -1234,6 +1234,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, };
--
1.7.4.1
From: David Miller <davem@davemloft.net>
Date: 2011-06-02 04:12:22
From: Stefan Metzmacher <metze@samba.org> Date: Wed, 1 Jun 2011 14:01:41 +0200
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>
Applied and queued up for -stable, thanks.
From: "Stefan (metze) Metzmacher" <metze@samba.org>
Date: 2011-06-06 12:23:30
Hi David,
From: Stefan Metzmacher <metze@samba.org> Date: Wed, 1 Jun 2011 14:01:41 +0200quoted
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>Applied and queued up for -stable, thanks.
It seems to be part of 3.0-rc2, but I'm not seeing it in any stable tree yet... When can I expect it in stable trees like 2.6.38.y? metze
From: Greg KH <gregkh@suse.de>
Date: 2011-06-06 15:10:15
On Mon, Jun 06, 2011 at 02:23:16PM +0200, Stefan (metze) Metzmacher wrote:
Hi David,quoted
From: Stefan Metzmacher <metze@samba.org> Date: Wed, 1 Jun 2011 14:01:41 +0200quoted
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>Applied and queued up for -stable, thanks.It seems to be part of 3.0-rc2, but I'm not seeing it in any stable tree yet... When can I expect it in stable trees like 2.6.38.y?
The .38.y tree is closed and will not have new releases, so you will never see it there, sorry. greg k-h
From: "Stefan (metze) Metzmacher" <metze@samba.org>
Date: 2011-06-07 07:38:25
Am 06.06.2011 17:06, schrieb Greg KH:
On Mon, Jun 06, 2011 at 02:23:16PM +0200, Stefan (metze) Metzmacher wrote:quoted
Hi David,quoted
From: Stefan Metzmacher <metze@samba.org> Date: Wed, 1 Jun 2011 14:01:41 +0200quoted
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>Applied and queued up for -stable, thanks.It seems to be part of 3.0-rc2, but I'm not seeing it in any stable tree yet... When can I expect it in stable trees like 2.6.38.y?The .38.y tree is closed and will not have new releases, so you will never see it there, sorry.
Ok, are there chances for .39.y? metze
From: Greg KH <gregkh@suse.de>
Date: 2011-06-07 14:44:04
On Tue, Jun 07, 2011 at 09:38:12AM +0200, Stefan (metze) Metzmacher wrote:
Am 06.06.2011 17:06, schrieb Greg KH:quoted
On Mon, Jun 06, 2011 at 02:23:16PM +0200, Stefan (metze) Metzmacher wrote:quoted
Hi David,quoted
From: Stefan Metzmacher <metze@samba.org> Date: Wed, 1 Jun 2011 14:01:41 +0200quoted
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>Applied and queued up for -stable, thanks.It seems to be part of 3.0-rc2, but I'm not seeing it in any stable tree yet... When can I expect it in stable trees like 2.6.38.y?The .38.y tree is closed and will not have new releases, so you will never see it there, sorry.Ok, are there chances for .39.y?
There are, it requires the patch to be in Linus's tree first, please see Documentation/stable_kernel_rules.txt for the details. greg k-h
From: "Stefan (metze) Metzmacher" <metze@samba.org>
Date: 2011-06-07 17:08:08
Am 07.06.2011 16:43, schrieb Greg KH:
On Tue, Jun 07, 2011 at 09:38:12AM +0200, Stefan (metze) Metzmacher wrote:quoted
Am 06.06.2011 17:06, schrieb Greg KH:quoted
On Mon, Jun 06, 2011 at 02:23:16PM +0200, Stefan (metze) Metzmacher wrote:quoted
Hi David,quoted
From: Stefan Metzmacher <metze@samba.org> Date: Wed, 1 Jun 2011 14:01:41 +0200quoted
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>Applied and queued up for -stable, thanks.It seems to be part of 3.0-rc2, but I'm not seeing it in any stable tree yet... When can I expect it in stable trees like 2.6.38.y?The .38.y tree is closed and will not have new releases, so you will never see it there, sorry.Ok, are there chances for .39.y?There are, it requires the patch to be in Linus's tree first,
It's already there: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=85e3c65fa3a1d0542c181510a950a2be7733ff29
please see Documentation/stable_kernel_rules.txt for the details.
Thanks for the pointer. It seems I've missed the Cc: [off-list ref] line(s). Would this be the correct syntax in order to get it into 2.6.38.x and 2.6.39.x? (2.6.38 wasn't closed at the time I submitted the patch) Cc: <stable@kernel.org> # .38.x Cc: <stable@kernel.org> # .39.x Should I resubmit the patch, or can you just cherry pick 85e3c65fa3a1d0542c181510a950a2be7733ff29 from Linus's tree? metze
From: Greg KH <gregkh@suse.de>
Date: 2011-06-07 17:35:31
On Tue, Jun 07, 2011 at 07:07:58PM +0200, Stefan (metze) Metzmacher wrote:
Am 07.06.2011 16:43, schrieb Greg KH:quoted
On Tue, Jun 07, 2011 at 09:38:12AM +0200, Stefan (metze) Metzmacher wrote:quoted
Am 06.06.2011 17:06, schrieb Greg KH:quoted
On Mon, Jun 06, 2011 at 02:23:16PM +0200, Stefan (metze) Metzmacher wrote:quoted
Hi David,quoted
From: Stefan Metzmacher <metze@samba.org> Date: Wed, 1 Jun 2011 14:01:41 +0200quoted
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>Applied and queued up for -stable, thanks.It seems to be part of 3.0-rc2, but I'm not seeing it in any stable tree yet... When can I expect it in stable trees like 2.6.38.y?The .38.y tree is closed and will not have new releases, so you will never see it there, sorry.Ok, are there chances for .39.y?There are, it requires the patch to be in Linus's tree first,It's already there: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=85e3c65fa3a1d0542c181510a950a2be7733ff29quoted
please see Documentation/stable_kernel_rules.txt for the details.Thanks for the pointer. It seems I've missed the Cc: [off-list ref] line(s). Would this be the correct syntax in order to get it into 2.6.38.x and 2.6.39.x? (2.6.38 wasn't closed at the time I submitted the patch) Cc: <stable@kernel.org> # .38.x Cc: <stable@kernel.org> # .39.x Should I resubmit the patch, or can you just cherry pick 85e3c65fa3a1d0542c181510a950a2be7733ff29 from Linus's tree?
I've queued it up now, thanks. greg k-h