Commit 85e3c65f authored Jun 01, 2011 by Stefan Metzmacher Committed by David S. Miller Jun 01, 2011

usbnet/cdc_ncm: add missing .reset_resume hook



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>

parent 307f73df

drivers/net/usb/cdc_ncm.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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,
		};