Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Stefan Metzmacher and committed by
David S. Miller
85e3c65f 307f73df

+2 -1
+2 -1
drivers/net/usb/cdc_ncm.c
··· 54 54 #include <linux/usb/usbnet.h> 55 55 #include <linux/usb/cdc.h> 56 56 57 - #define DRIVER_VERSION "24-May-2011" 57 + #define DRIVER_VERSION "01-June-2011" 58 58 59 59 /* CDC NCM subclass 3.2.1 */ 60 60 #define USB_CDC_NCM_NDP16_LENGTH_MIN 0x10 ··· 1234 1234 .disconnect = cdc_ncm_disconnect, 1235 1235 .suspend = usbnet_suspend, 1236 1236 .resume = usbnet_resume, 1237 + .reset_resume = usbnet_resume, 1237 1238 .supports_autosuspend = 1, 1238 1239 }; 1239 1240