Patchwork usbnet/cdc_ncm: add missing .reset_resume hook

login
register
mail settings
Submitter Stefan Metzmacher
Date June 1, 2011, 12:01 p.m.
Message ID <1306929701-22861-2-git-send-email-metze@samba.org>
Download mbox | patch
Permalink /patch/98172/
State Accepted
Delegated to: David Miller
Headers show

Comments

Stefan Metzmacher - June 1, 2011, 12:01 p.m.
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(-)
David Miller - June 2, 2011, 4:11 a.m.
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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Stefan Metzmacher - June 6, 2011, 12:23 p.m.
Hi David,

> 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.

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
gregkh@suse.de - June 6, 2011, 3:06 p.m.
On Mon, Jun 06, 2011 at 02:23:16PM +0200, Stefan (metze) Metzmacher wrote:
> Hi David,
> 
> > 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.
> 
> 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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Stefan Metzmacher - June 7, 2011, 7:38 a.m.
Am 06.06.2011 17:06, schrieb Greg KH:
> On Mon, Jun 06, 2011 at 02:23:16PM +0200, Stefan (metze) Metzmacher wrote:
>> Hi David,
>>
>>> 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.
>>
>> 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
gregkh@suse.de - June 7, 2011, 2:43 p.m.
On Tue, Jun 07, 2011 at 09:38:12AM +0200, Stefan (metze) Metzmacher wrote:
> Am 06.06.2011 17:06, schrieb Greg KH:
> > On Mon, Jun 06, 2011 at 02:23:16PM +0200, Stefan (metze) Metzmacher wrote:
> >> Hi David,
> >>
> >>> 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.
> >>
> >> 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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Stefan Metzmacher - June 7, 2011, 5:07 p.m.
Am 07.06.2011 16:43, schrieb Greg KH:
> On Tue, Jun 07, 2011 at 09:38:12AM +0200, Stefan (metze) Metzmacher wrote:
>> Am 06.06.2011 17:06, schrieb Greg KH:
>>> On Mon, Jun 06, 2011 at 02:23:16PM +0200, Stefan (metze) Metzmacher wrote:
>>>> Hi David,
>>>>
>>>>> 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.
>>>>
>>>> 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: <stable@kernel.org>
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
gregkh@suse.de - June 7, 2011, 5:35 p.m.
On Tue, Jun 07, 2011 at 07:07:58PM +0200, Stefan (metze) Metzmacher wrote:
> Am 07.06.2011 16:43, schrieb Greg KH:
> > On Tue, Jun 07, 2011 at 09:38:12AM +0200, Stefan (metze) Metzmacher wrote:
> >> Am 06.06.2011 17:06, schrieb Greg KH:
> >>> On Mon, Jun 06, 2011 at 02:23:16PM +0200, Stefan (metze) Metzmacher wrote:
> >>>> Hi David,
> >>>>
> >>>>> 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.
> >>>>
> >>>> 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: <stable@kernel.org>
> 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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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,
 };