diff options
| author | Oliver Neukum <oneukum@suse.de> | 2014-07-28 10:12:34 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-29 21:22:15 +0200 |
| commit | 20fbe3ae990fd54fc7d1f889d61958bc8b38f254 (patch) | |
| tree | 06f6b9af9f77b65c1bbd92cf1da3e3b64266c6e3 /drivers/net/usb/usbnet.c | |
| parent | net: sendmsg: fix NULL pointer dereference (diff) | |
| download | linux-20fbe3ae990fd54fc7d1f889d61958bc8b38f254.tar.xz linux-20fbe3ae990fd54fc7d1f889d61958bc8b38f254.zip | |
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); |