diff options
| author | Oliver Neukum <oneukum@suse.de> | 2014-08-01 16:01:51 +0400 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-03 02:44:18 +0400 | 
| commit | dbcdd4d58c7230bea3157d56d6ef77c493b3865b (patch) | |
| tree | 461928882c98e191e56cfe24bc430bbd3f5a8962 /drivers/net/usb/usbnet.c | |
| parent | 06ebb06d49486676272a3c030bfeef4bd969a8e6 (diff) | |
| download | linux-dbcdd4d58c7230bea3157d56d6ef77c493b3865b.tar.xz | |
cdc_subset: deal with a device that needs reset for timeout
This device needs to be reset to recover from a timeout.
Unfortunately this can be handled only at the level of
the subdrivers.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/usbnet.c')
| -rw-r--r-- | drivers/net/usb/usbnet.c | 8 | 
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index f9e96c427558..5173821a9575 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1218,8 +1218,12 @@ void usbnet_tx_timeout (struct net_device *net)  	unlink_urbs (dev, &dev->txq);  	tasklet_schedule (&dev->bh); - -	// FIXME: device recovery -- reset? +	/* this needs to be handled individually because the generic layer +	 * doesn't know what is sufficient and could not restore private +	 * information if a remedy of an unconditional reset were used. +	 */ +	if (dev->driver_info->recover) +		(dev->driver_info->recover)(dev);  }  EXPORT_SYMBOL_GPL(usbnet_tx_timeout);  | 
